fixing phpdoc + unused stuff