more cruft removed