Merge "Remove unused code."