Minor updates to parameter documentation, return types and exceptions thrown

Remove some unused variables

Change-Id: I3e65208e30e975f3babac65d22b48a46a9f9a5e7