fix phpdoc and remove unused stuff