Cleaning up more, gettin there!