Cleaning up even more!