Remove more obsolete code.