still more cleanup