removed more cruft