updated comments with correct PHPDoc annotations, removed unused functions