Clean up and copyrights