fix phpdoc and remove unused stuff
Merge pull request #241 from UFOMelkor/hotfix

Phpdoc fixes + removes unused code