[Upg] Add copyright header and cleanp