Removed a bunch of cruft

Ditto