more cleanup
starting to make some sense