Get rid of some unused variables
Merge pull request #816 from johndaniels/minorfix

Get rid of some unused variables
Another unused variable
Test method does not need to be marked async
Merge branch 'develop' into 2.0