stage one clean up
more cleanup