Remove a lot of obsolete code.