Remove more seemingly unused code.