Removed debug code
phpdoc fixes, unused variable
Removed unused imports