more cruft elimination
cleanup