Cleaning up some more...