removed more cruft
removed more cruft