Remove more antiquated code.