more and more cleanup