some more cleanup...