Fixed issue: Fixed PHPDoc
Fixed issue: Removed not needed class