Adding some more cleanup...