some more cleanup, hopefully