a little more cleanup...