More removal of obsolete junk