Removed a bunch of old stuff, most of which was not in use.