removed a bunch of unnecessary cruft