Remove more obsolete material