Removed unused imports, fixed phpdoc