Cleaning up a lot still