more cleanup
yet more cleanup