Merge "Remove some unused code."