cleanup
removing a bunch of cruft