initial cleanup
more cleanup