Removed a bunch of old stuff.