Remove a bunch of obsoleted kludges