Clean-up + copyright headers