more cleanup
and more