Copyright cleanups and updating