PIM-2190: Clean phpdoc
PIM-2190: Clean use statements