Remove more obsolete globals.