Merge "Remove unused code"