Fixed PHPDoc, and removed unused uses.