more cleanup, mostly prints