Clean up and copyright notices