Removed a bunch of obsolete stuff.