some more cleanup fixes