Cleanup, add copyright notices