Remove nonexistent params and returns
Fix doc blocks accuracy
Merge pull request #2720 from bcrowe/3.0-apigen

3.0 - Remove nonexistent params and returns