Cleanup OAuth2 code