more PhpDocs; remove dead code