more cleanup, ready for test deploy