Get rid of some unused variables
Another unused variable
Test method does not need to be marked async