[Upg] cleanup
[Upg] PHPDoc