some more cleanup stuff