Cleaning up even more