just some more cleanup stuff