Merge "Delete some unused code."