Remove another bunch of obsolete junk