New copyright, massive cleanup