cleanup following OAuth2 merge
Merge pull request #88 from jateeter/master

cleanup following OAuth2 merge