Cleaning up moved to top