Get rid of old cruft and fix weird tab thing.