Just a little more cleanup...