more cleanup!