Merge "remove unused code"