removed some more cruft