Killed some more now-obsolete code.