Remove more obsolete stuff.