Clean up tech debt in OauthHelper