removed a bunch of cruft