Phpdoc fixes + unused code