Dropped dependency on oauth2 lib