Reverted cleanups of copyrghts