removing cruft
more cleanup