more cleanup fixes