Removing oauth2 dependency