Removed a bunch of old cruft