Merge "remove unused hardcoding"