removed dead code; fixed phpdoc