more cleanup work