lots more cleanup