Cleaning up 6