removing still more cruft
clean up