diff --git a/docs/backends/aol.rst b/docs/backends/aol.rst
deleted file mode 100644
index 23e59bc3..00000000
--- a/docs/backends/aol.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-AOL
-===
-
-AOL OpenID doesn't require major settings beside being defined on
-``AUTHENTICATION_BACKENDS```::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.aol.AOLOpenId',
-        ...
-    )
diff --git a/docs/backends/bungie.rst b/docs/backends/bungie.rst
index d5da70b9..c7f4892b 100644
--- a/docs/backends/bungie.rst
+++ b/docs/backends/bungie.rst
@@ -65,7 +65,7 @@ Bungie uses OAuth 2.0 for authentication.
 
       AUTHENTICATION_BACKENDS = (
           ...
-          'social_core.backends.bungie.BungieBaseAuth',
+          'social_core.backends.bungie.BungieOAuth2',
           ...
       )
 
diff --git a/docs/backends/douban.rst b/docs/backends/douban.rst
index cc4ccae7..c9bd83c8 100644
--- a/docs/backends/douban.rst
+++ b/docs/backends/douban.rst
@@ -1,31 +1,7 @@
 Douban
 ======
 
-Douban supports OAuth 1 and 2.
-
-Douban OAuth1
--------------
-
-Douban OAuth 1 works similar to Twitter OAuth.
-
-Douban offers per application keys named ``Consumer Key`` and ``Consumer
-Secret``. To enable Douban OAuth these two keys are needed. Further
-documentation at `Douban Services & API`_:
-
-- Register a new application at `Douban API Key`_, make sure to mark the **web
-  application** checkbox.
-
-- Fill **Consumer Key** and **Consumer Secret** values in settings::
-
-      SOCIAL_AUTH_DOUBAN_KEY = ''
-      SOCIAL_AUTH_DOUBAN_SECRET = ''
-
-- Add ``'social_core.backends.douban.DoubanOAuth'`` into your
-  ``SOCIAL_AUTH_AUTHENTICATION_BACKENDS``.
-
-
-Douban OAuth2
--------------
+Douban supports OAuth2.
 
 Recently Douban launched their OAuth2 support and the new developer site, you
 can find documentation at `Douban Developers`_. To setup OAuth2 follow:
@@ -41,7 +17,5 @@ can find documentation at `Douban Developers`_. To setup OAuth2 follow:
 - Add ``'social_core.backends.douban.DoubanOAuth2'`` into your
   ``SOCIAL_AUTH_AUTHENTICATION_BACKENDS``.
 
-.. _Douban Services & API: http://www.douban.com/service/
-.. _Douban API Key: http://www.douban.com/service/apikey/apply
 .. _Douban Developers: http://developers.douban.com/
 .. _Create A Douban App : http://developers.douban.com/apikey/apply
diff --git a/docs/backends/dropbox.rst b/docs/backends/dropbox.rst
index 8c99116c..2ad0b675 100644
--- a/docs/backends/dropbox.rst
+++ b/docs/backends/dropbox.rst
@@ -1,11 +1,9 @@
 Dropbox
 =======
 
-Dropbox supports both OAuth 1 and 2.
+Dropbox supports OAuth2.
 
-- Register a new application at `Dropbox Developers`_, and follow the
-  instructions below for the version of OAuth for which you are adding
-  support.
+- Register a new application at `Dropbox Developers`_.
 
 
 OAuth2 Api V2
@@ -15,43 +13,7 @@ Add the Dropbox OAuth2 backend to your settings page::
 
     SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
         ...
-        'social.backends.dropbox.DropboxOAuth2V2',
-        ...
-    )
-
-- Fill ``App Key`` and ``App Secret`` values in the settings::
-
-      SOCIAL_AUTH_DROPBOX_OAUTH2_KEY = ''
-      SOCIAL_AUTH_DROPBOX_OAUTH2_SECRET = ''
-
-OAuth1
-------
-
-.. deprecated:: V1 api is deprecated. https://blogs.dropbox.com/developers/2016/06/api-v1-deprecated/
-
-Add the Dropbox OAuth backend to your settings page::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.dropbox.DropboxOAuth',
-        ...
-    )
-
-- Fill ``App Key`` and ``App Secret`` values in the settings::
-
-      SOCIAL_AUTH_DROPBOX_KEY = ''
-      SOCIAL_AUTH_DROPBOX_SECRET = ''
-
-OAuth2
-------
-
-.. deprecated:: V1 api is deprecated. https://blogs.dropbox.com/developers/2016/06/api-v1-deprecated/
-
-Add the Dropbox OAuth2 backend to your settings page::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.dropbox.DropboxOAuth2',
+        'social_core.backends.dropbox.DropboxOAuth2V2',
         ...
     )
 
diff --git a/docs/backends/google.rst b/docs/backends/google.rst
index 15eec8f7..efb0e38d 100644
--- a/docs/backends/google.rst
+++ b/docs/backends/google.rst
@@ -125,118 +125,6 @@ on the client side. Because of this `start` url is not available, only a `comple
 
 
 
-Google+ Sign-In
----------------
-
-`Google+ Sign In`_ works a lot like OAuth2, but most of the initial work is
-done by their Javascript which thens calls a defined handler to complete the
-auth process.
-
-* To enable the backend create an application using the `Google
-  console`_ and following the steps from the `official guide`_. Make
-  sure to enable the Google+ API in the console.
-
-* Fill in the key settings looking inside the Google console the subsection
-  ``Credentials`` inside ``API & auth``::
-
-    AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.google.GooglePlusAuth',
-    )
-
-    SOCIAL_AUTH_GOOGLE_PLUS_KEY = '...'
-    SOCIAL_AUTH_GOOGLE_PLUS_SECRET = '...'
-
-  ``SOCIAL_AUTH_GOOGLE_PLUS_KEY`` corresponds to the variable ``CLIENT ID``.
-  ``SOCIAL_AUTH_GOOGLE_PLUS_SECRET`` corresponds to the variable
-  ``CLIENT SECRET``.
-
-* Add the sign-in button to your template, you can use the SDK button
-  or add your own and attach the click handler to it (check `Google+ Identity Sign-In`_
-  documentation about it)::
-
-    <div id="google-plus-button">Google+ Sign In</div>
-
-* Add the Javascript snippet in the same template as above::
-
-    <script src="https://apis.google.com/js/api:client.js"></script>
-
-    <script type="text/javascript">
-      gapi.load('auth2', function () {
-        var auth2;
-
-        auth2 = gapi.auth2.init({
-          client_id: "<PUT SOCIAL_AUTH_GOOGLE_PLUS_KEY HERE>",
-          scope: "<PUT BACKEND SCOPE HERE>"
-        });
-
-        auth2.then(function () {
-          var button = document.getElementById("google-plus-button");
-          console.log("User is signed-in in Google+ platform?", auth2.isSignedIn.get() ? "Yes" : "No");
-
-          auth2.attachClickHandler(button, {}, function (googleUser) {
-            // Send access-token to backend to finish the authenticate
-            // with your application
-
-            var authResponse = googleUser.getAuthResponse();
-            var $form;
-            var $input;
-
-            $form = $("<form>");
-            $form.attr("action", "/complete/google-plus");
-            $form.attr("method", "post");
-            $input = $("<input>");
-            $input.attr("name", "id_token");
-            $input.attr("value", authResponse.id_token);
-            $form.append($input);
-            // Add csrf-token if needed
-            $(document.body).append($form);
-            $form.submit();
-          });
-        });
-      });
-    </script>
-
-* Logging out
-
-  Logging-out can be tricky when using the the platform SDK because it
-  can trigger an automatic sign-in when listening to the user status
-  change. With the method show above, that won't happen, but if the UI
-  depends more in the SDK values than the backend, then things can get
-  out of sync easily. To prevent this, the user should be logged-out
-  from Google+ platform too. This can be accomplished by doing::
-
-    <script type="text/javascript">
-      gapi.load('auth2', function () {
-        var auth2;
-
-        auth2 = gapi.auth2.init({
-          client_id: "{{ plus_id }}",
-          scope: "{{ plus_scope }}"
-        });
-
-        auth2.then(function () {
-          if (auth2.isSignedIn.get()) {
-            $('#logout').on('click', function (event) {
-              event.preventDefault();
-              auth2.signOut().then(function () {
-                console.log("Logged out from Google+ platform");
-                document.location = "/logout";
-              });
-            });
-          }
-        });
-      });
-    </script>
-
-
-Google OpenID
--------------
-
-Google OpenID works straightforward, no settings are needed. Domains or emails
-whitelists can be applied too, check the whitelists_ settings for details.
-
-
 Orkut
 -----
 
@@ -261,50 +149,14 @@ Refresh Tokens
 --------------
 
 To get an OAuth2 refresh token along with the access token, you must pass an extra argument: ``access_type=offline``.
-To do this with Google+ sign-in::
+To do this with Google OAuth2::
 
-      SOCIAL_AUTH_GOOGLE_PLUS_AUTH_EXTRA_ARGUMENTS = {
+      SOCIAL_AUTH_GOOGLE_OAUTH2_AUTH_EXTRA_ARGUMENTS = {
             'access_type': 'offline'
       }
 
 
-Scopes deprecation
-------------------
-
-Google is deprecating the full-url scopes from `Sept 1, 2014`_ in favor of
-``Google+ API`` and the recently introduced shorter scopes names. But
-``python-social-auth`` already introduced the scopes change at e3525187_ which
-was released at ``v0.1.24``.
-
-But, to enable the new scopes the application requires ``Google+ API`` to be
-enabled in the `Google console`_ dashboard, the change is quick and quite
-simple, but if any developer desires to keep using the old scopes, it's
-possible with the following settings::
-
-    # Google OAuth2 (google-oauth2)
-    SOCIAL_AUTH_GOOGLE_OAUTH2_IGNORE_DEFAULT_SCOPE = True
-    SOCIAL_AUTH_GOOGLE_OAUTH2_SCOPE = [
-        'https://www.googleapis.com/auth/userinfo.email',
-        'https://www.googleapis.com/auth/userinfo.profile'
-    ]
-
-    # Google+ SignIn (google-plus)
-    SOCIAL_AUTH_GOOGLE_PLUS_IGNORE_DEFAULT_SCOPE = True
-    SOCIAL_AUTH_GOOGLE_PLUS_SCOPE = [
-        'https://www.googleapis.com/auth/plus.login',
-        'https://www.googleapis.com/auth/userinfo.email',
-        'https://www.googleapis.com/auth/userinfo.profile'
-    ]
-
-To ease the change, the old API and scopes is still supported by the
-application, the new values are the default option but if having troubles
-supporting them you can default to the old values by defining this setting::
-
-    SOCIAL_AUTH_GOOGLE_OAUTH2_USE_DEPRECATED_API = True
-    SOCIAL_AUTH_GOOGLE_PLUS_USE_DEPRECATED_API = True
-
 .. _Google support: http://www.google.com/support/a/bin/answer.py?hl=en&answer=162105
-.. _Google OpenID: http://code.google.com/apis/accounts/docs/OpenID.html
 .. _Google OAuth: http://code.google.com/apis/accounts/docs/OAuth.html
 .. _Google OAuth2: http://code.google.com/apis/accounts/docs/OAuth2.html
 .. _OAuth2 Registering: http://code.google.com/apis/accounts/docs/OAuth2.html#Registering
@@ -313,12 +165,7 @@ supporting them you can default to the old values by defining this setting::
 .. _shut down: https://support.google.com/orkut/?csw=1#Authenticating
 .. _Google Data Protocol Directory: http://code.google.com/apis/gdata/docs/directory.html
 .. _whitelists: ../configuration/settings.html#whitelists
-.. _Google+ Sign In: https://developers.google.com/+/web/signin/
 .. _Google console: https://code.google.com/apis/console
-.. _official guide: https://developers.google.com/+/web/signin/#step_1_create_a_client_id_and_client_secret
-.. _Sept 1, 2014: https://developers.google.com/+/api/auth-migration#timetable
-.. _e3525187: https://github.com/omab/python-social-auth/commit/e35251878a88954cecf8e575eca27c63164b9f67
-.. _Google+ Identity Sign-In: https://developers.google.com/identity/sign-in/web/sign-in
 .. _Google One Tap: https://developers.google.com/identity/gsi/web/guides/features
 .. _related issue: https://issuetracker.google.com/issues/226157137
 .. _One Tap snippet: https://developers.google.com/identity/gsi/web/guides/display-google-one-tap
diff --git a/docs/backends/index.rst b/docs/backends/index.rst
index 1af2fe74..d20e356f 100644
--- a/docs/backends/index.rst
+++ b/docs/backends/index.rst
@@ -49,7 +49,6 @@ Social backends
 
    amazon
    angel
-   aol
    apple
    arcgis
    auth0
@@ -98,7 +97,6 @@ Social backends
    justgiving
    kakao
    keycloak
-   khanacademy
    kick
    lastfm
    launchpad
@@ -118,14 +116,12 @@ Social backends
    microsoftgraph
    mineid
    mixcloud
-   naszaklasa
    nationbuilder
    naver
    nfdi
    ngpvan_actionid
    odnoklassnikiru
    okta
-   openstreetmap
    openstreetmap_oauth2
    oidc
    orbi
@@ -139,12 +135,10 @@ Social backends
    qiita
    qq
    quizlet
-   rdio
    reddit
    runkeeper
    salesforce
    seznam
-   shimmering
    shopify
    simplelogin
    sketchfab
@@ -160,7 +154,6 @@ Social backends
    stripe
    taobao
    telegram
-   thisismyjam
    trello
    tripit
    tumblr
diff --git a/docs/backends/khanacademy.rst b/docs/backends/khanacademy.rst
deleted file mode 100644
index bd54e344..00000000
--- a/docs/backends/khanacademy.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-Khan Academy
-============
-
-Khan Academy uses a variant of OAuth1 authentication flow. Check the API
-details at `Khan Academy API Authentication`_.
-
-Follow this steps in order to use the backend:
-
-- Register a new application at `Khan Academy API Apps`_,
-
-- Fill **Consumer Key** and **Consumer Secret** values::
-
-    SOCIAL_AUTH_KHANACADEMY_OAUTH1_KEY = ''
-    SOCIAL_AUTH_KHANACADEMY_OAUTH1_SECRET = ''
-
-- Add the backend to ``AUTHENTICATION_BACKENDS`` setting::
-
-    AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.khanacademy.KhanAcademyOAuth1',
-        ...
-    )
-
-.. _Khan Academy API Authentication: https://github.com/Khan/khan-api/wiki/Khan-Academy-API-Authentication
-.. _Khan Academy API Apps: http://www.khanacademy.org/api-apps/register
diff --git a/docs/backends/livejournal.rst b/docs/backends/livejournal.rst
index 5191a2c7..93b335e0 100644
--- a/docs/backends/livejournal.rst
+++ b/docs/backends/livejournal.rst
@@ -6,7 +6,7 @@ work, beside being defined on ``AUTHENTICATION_BACKENDS```::
 
     SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
         ...
-        'social_core.backends.aol.AOLOpenId',
+        'social_core.backends.livejournal.LiveJournalOpenId',
         ...
     )
 
diff --git a/docs/backends/mendeley.rst b/docs/backends/mendeley.rst
index 0a9e540c..fdbaa299 100644
--- a/docs/backends/mendeley.rst
+++ b/docs/backends/mendeley.rst
@@ -1,31 +1,11 @@
 Mendeley
 ========
 
-Mendeley supports OAuth1 and OAuth2, they are in the process of deprecating
-OAuth1 API (which should be fully deprecated on April 2014, check their
-announcement_).
-
-
-OAuth1
-------
-
-In order to support OAuth1 (not recommended, use OAuth2 instead):
-
-- Register a new application at `Mendeley Application Registration`_
-
-- Fill **Consumer Key** and **Consumer Secret** values::
-
-      SOCIAL_AUTH_MENDELEY_KEY = ''
-      SOCIAL_AUTH_MENDELEY_SECRET = ''
-
-
-OAuth2
-------
+Mendeley supports OAuth2.
 
 In order to support OAuth2:
 
-- Register a new application at `Mendeley Application Registration`_, or
-  migrate your OAuth1 application, check their `migration steps here`_.
+- Register a new application at `Mendeley Application Registration`_.
 
 - Fill **Application ID** and **Application Secret** values::
 
@@ -34,5 +14,3 @@ In order to support OAuth2:
 
 
 .. _Mendeley Application Registration: http://dev.mendeley.com/applications/register/
-.. _announcement: https://sites.google.com/site/mendeleyapi/home/authentication
-.. _migration steps here: https://groups.google.com/forum/#!topic/mendeley-open-api-developers/KmUQW9I0ST0
diff --git a/docs/backends/naszaklasa.rst b/docs/backends/naszaklasa.rst
deleted file mode 100644
index 212e8795..00000000
--- a/docs/backends/naszaklasa.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-NationBuilder
-=============
-
-`NaszaKlasa supports OAuth2`_ as their authentication mechanism. Follow these
-steps in order to use it:
-
-- Register a new application at your `NK Developers`_ (define the `Callback
-  URL` to ``http://example.com/complete/nk/`` where ``example.com``
-  is your domain).
-
-- Fill the ``Client ID`` and ``Client Secret`` values from the newly created
-  application::
-
-    SOCIAL_AUTH_NK_KEY = ''
-    SOCIAL_AUTH_NK_SECRET = ''
-
-- Enable the backend in ``AUTHENTICATION_BACKENDS`` setting::
-
-    AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.nk.NKOAuth2',
-        ...
-    )
-
-.. _NaszaKlasa supports OAuth2: https://developers.nk.pl
-.. _NK Developers: https://developers.nk.pl/developers/oauth2client/form
diff --git a/docs/backends/openstreetmap.rst b/docs/backends/openstreetmap.rst
deleted file mode 100644
index 5a8700e4..00000000
--- a/docs/backends/openstreetmap.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-OpenStreetMap (Legacy OAuth 1.0a)
-=================================
-
-**Note: OAuth 1.0(a) support will be sunset in Summer 2024. Please use OAuth 2.0 instead.**
-
-OpenStreetMap supports OAuth 1.0 and 1.0a but 1.0a should be used for the new
-applications, as 1.0 is for support of legacy clients only.
-
-Access tokens currently do not expire automatically.
-
-More documentation at `OpenStreetMap Wiki`_:
-
-- Login to your account
-
-- Register your application as OAuth consumer on your `OpenStreetMap user settings page`_, and
-
-- Set ``App Key`` and ``App Secret`` values in the settings::
-
-      SOCIAL_AUTH_OPENSTREETMAP_KEY = ''
-      SOCIAL_AUTH_OPENSTREETMAP_SECRET = ''
-
-.. _OpenStreetMap Wiki: http://wiki.openstreetmap.org/wiki/OAuth
-.. _OpenStreetMap user settings page: http://www.openstreetmap.org/user/username/oauth_clients/new
diff --git a/docs/backends/pixelpin.rst b/docs/backends/pixelpin.rst
index e47f2aae..91be3974 100644
--- a/docs/backends/pixelpin.rst
+++ b/docs/backends/pixelpin.rst
@@ -1,13 +1,13 @@
 PixelPin
 ========
 
-PixelPin only supports OAuth2.
+PixelPin supports OpenID Connect.
 
-PixelPin OAuth2
----------------
+PixelPin OpenID Connect
+-----------------------
 
 Developer documentation for PixelPin can be found at
-http://developer.pixelpin.co.uk/. To setup OAuth2 do the following:
+http://developer.pixelpin.co.uk/. To setup OpenID Connect do the following:
 
 - Register a new developer account at `PixelPin Developers`_.
 
@@ -25,7 +25,7 @@ http://developer.pixelpin.co.uk/. To setup OAuth2 do the following:
       SOCIAL_AUTH_PIXELPIN_OAUTH2_KEY = ''
       SOCIAL_AUTH_PIXELPIN_OAUTH2_SECRET = ''
 
-- Add ``'social_core.backends.pixelpin.PixelPinOAuth2'`` into your
+- Add ``'social_core.backends.pixelpin.PixelPinOpenIDConnect'`` into your
   ``SOCIAL_AUTH_AUTHENTICATION_BACKENDS``.
 
 .. _PixelPin homepage: http://pixelpin.co.uk/
diff --git a/docs/backends/qq.rst b/docs/backends/qq.rst
index ddf56809..bbe0d0f5 100644
--- a/docs/backends/qq.rst
+++ b/docs/backends/qq.rst
@@ -15,7 +15,7 @@ QQ implemented OAuth2 protocol for their authentication mechanism. To enable
 
     SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
         ...
-        'social_core.backends.qq.QQOauth2',
+        'social_core.backends.qq.QQOAuth2',
         ...
     )
 
diff --git a/docs/backends/rdio.rst b/docs/backends/rdio.rst
deleted file mode 100644
index 7aa58ced..00000000
--- a/docs/backends/rdio.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-Rdio
-====
-
-Rdio provides OAuth 1 and 2 support for their authentication process.
-
-OAuth 1.0a
-----------
-
-To setup Rdio OAuth 1.0a, add the following to your settings page::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.rdio.RdioOAuth1',
-        ...
-    )
-
-    SOCIAL_AUTH_RDIO_OAUTH1_KEY = ''
-    SOCIAL_AUTH_RDIO_OAUTH1_SECRET = ''
-
-
-OAuth 2.0
----------
-
-To setup Rdio OAuth 2.0, add the following to your settings page::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.rdio.RdioOAuth2',
-        ...
-    )
-
-    SOCIAL_AUTH_RDIO_OAUTH2_KEY = os.environ['RDIO_OAUTH2_KEY']
-    SOCIAL_AUTH_RDIO_OAUTH2_SECRET = os.environ['RDIO_OAUTH2_SECRET']
-    SOCIAL_AUTH_RDIO_OAUTH2_SCOPE = []
-
-
-Extra Fields
-------------
-
-The following extra fields are automatically requested:
-
-- rdio_id
-- rdio_icon_url
-- rdio_profile_url
-- rdio_username
-- rdio_stream_region
diff --git a/docs/backends/shimmering.rst b/docs/backends/shimmering.rst
deleted file mode 100644
index a92a9bd0..00000000
--- a/docs/backends/shimmering.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-Shimmering Verify
-=================
-
-Shimmering implemented OAuth2 protocol for their authentication mechanism. To
-enable ``python-social_core-auth`` support follow this steps:
-
-1. Go to `Shimmering Developer Console`_ and create an application.
-
-2. Fill App Id and Secret in your project settings::
-
-    SOCIAL_AUTH_SHIMMERING_KEY = '...'
-    SOCIAL_AUTH_SHIMMERING_SECRET = '...'
-
-3. Enable the backend::
-
-    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
-        ...
-        'social_core.backends.shimmering.ShimmeringOAuth2',
-        ...
-    )
-
-.. _Shimmering Developer Console: http://developers.shimmeringverify.com
diff --git a/docs/backends/thisismyjam.rst b/docs/backends/thisismyjam.rst
deleted file mode 100644
index 02efa79c..00000000
--- a/docs/backends/thisismyjam.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-ThisIsMyJam
-===========
-
-ThisIsMyJam uses OAuth1 for its auth mechanism.
-
-- Register a new application at `ThisIsMyJam App Registration`_, set your
-  application name, website and redirect URI.
-
-- Fill ``Client Id`` and ``Client Secret`` values in the settings::
-
-      SOCIAL_AUTH_THISISMYJAM_KEY = ''
-      SOCIAL_AUTH_THISISMYJAM_SECRET = ''
-
-Check the rest of their doc at `ThisIsMyJam API Docs`_.
-
-.. _ThisIsMyJam App Registration: https://www.thisismyjam.com/developers
-.. _ThisIsMyJam API Docs: https://www.thisismyjam.com/developers/docs
diff --git a/docs/backends/yahoo.rst b/docs/backends/yahoo.rst
index f05e9505..43db2a71 100644
--- a/docs/backends/yahoo.rst
+++ b/docs/backends/yahoo.rst
@@ -1,29 +1,21 @@
 Yahoo
 =====
 
-Yahoo supports OpenID and OAuth2 for their auth flow.
+Yahoo supports OAuth2 for their auth flow.
 
+OAuth 2.0 workflow, useful if you are planning to use Yahoo's API.
 
-Yahoo OpenID
-------------
+- Register a new application at `Yahoo Developer Center`_, set your app domain
+  and configure scopes (they can't be overridden by application).
 
-OpenID doesn't require any particular configuration beside enabling the backend
-in the ``AUTHENTICATION_BACKENDS`` setting::
+- Add the Yahoo OAuth2 backend to your settings page::
 
-    AUTHENTICATION_BACKENDS = (
+    SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
         ...
         'social_core.backends.yahoo.YahooOAuth2',
         ...
     )
 
-
-Yahoo OAuth2
-------------
-OAuth 2.0 workflow, useful if you are planning to use Yahoo's API.
-
-- Register a new application at `Yahoo Developer Center`_, set your app domain
-  and configure scopes (they can't be overridden by application).
-
 - Fill ``Consumer Key`` and ``Consumer Secret`` values in the settings::
 
       SOCIAL_AUTH_YAHOO_OAUTH2_KEY = ''
diff --git a/docs/configuration/porting_from_dsa.rst b/docs/configuration/porting_from_dsa.rst
index 54e20d38..79c1cfc7 100644
--- a/docs/configuration/porting_from_dsa.rst
+++ b/docs/configuration/porting_from_dsa.rst
@@ -95,7 +95,6 @@ changes. Examples of the new import paths::
 
     AUTHENTICATION_BACKENDS = (
         'social_core.backends.open_id.OpenIdAuth',
-        'social_core.backends.google.GoogleOpenId',
         'social_core.backends.google.GoogleOAuth2',
         'social_core.backends.google.GoogleOAuth',
         'social_core.backends.twitter.TwitterOAuth',
diff --git a/docs/configuration/settings.rst b/docs/configuration/settings.rst
index fcca984b..4e6ff73e 100644
--- a/docs/configuration/settings.rst
+++ b/docs/configuration/settings.rst
@@ -49,11 +49,10 @@ Register the backends you plan to use, on Django framework use the usual
 
     SOCIAL_AUTH_AUTHENTICATION_BACKENDS = (
         'social_core.backends.open_id.OpenIdAuth',
-        'social_core.backends.google.GoogleOpenId',
         'social_core.backends.google.GoogleOAuth2',
         'social_core.backends.google.GoogleOAuth',
         'social_core.backends.twitter.TwitterOAuth',
-        'social_core.backends.yahoo.YahooOpenId',
+        'social_core.backends.yahoo.YahooOAuth2',
         ...
     )
 
@@ -225,10 +224,10 @@ instead of OpenStreetMap, or self-hosted instances).
       SOCIAL_AUTH_GITHUB_REVOKE_TOKEN_URL = 'https://github.example.com/api/revoke'
 
 These settings allow you to use backends with custom deployments. For example,
-to use the OpenStreetMap backend with OpenHistoricalMap::
+to use the OpenStreetMap OAuth2 backend with OpenHistoricalMap::
 
-    SOCIAL_AUTH_OPENSTREETMAP_AUTHORIZATION_URL = 'https://www.openhistoricalmap.org/oauth/authorize'
-    SOCIAL_AUTH_OPENSTREETMAP_ACCESS_TOKEN_URL = 'https://www.openhistoricalmap.org/oauth/access_token'
+    SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_AUTHORIZATION_URL = 'https://www.openhistoricalmap.org/oauth2/authorize'
+    SOCIAL_AUTH_OPENSTREETMAP_OAUTH2_ACCESS_TOKEN_URL = 'https://www.openhistoricalmap.org/oauth2/token'
 
 Note that backend-specific settings (with the backend name) take precedence over
 generic settings, following the same pattern as other settings in this library.
diff --git a/docs/intro.rst b/docs/intro.rst
index d8577c89..5a79787d 100644
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -41,8 +41,8 @@ or extend current one):
 * Dailymotion_ OAuth2
 * Deezer_ OAuth2
 * Disqus_ OAuth2
-* Douban_ OAuth1 and OAuth2
-* Dropbox_ OAuth1
+* Douban_ OAuth2
+* Dropbox_ OAuth2
 * Eventbrite_ OAuth2
 * Evernote_ OAuth1
 * Facebook_ OAuth2 and OAuth2 for Applications
@@ -51,7 +51,7 @@ or extend current one):
 * Flickr_ OAuth1
 * Foursquare_ OAuth2
 * GitHub_ OAuth2
-* Google_ OAuth1, OAuth2 and OpenID
+* Google_ OAuth1 and OAuth2
 * Instagram_ OAuth2
 * Kakao_ OAuth2
 * Keycloak_ OpenID
@@ -61,18 +61,15 @@ or extend current one):
 * Mailru_ OAuth2
 * MineID_ OAuth2
 * Mixcloud_ OAuth2
-* NaszaKlasa_ OAuth2
 * `NGPVAN ActionID`_ OpenID
 * Odnoklassniki_ OAuth2 and Application Auth
 * OpenID_
 * Podio_ OAuth2
 * Pinterest_ OAuth2
-* Rdio_ OAuth1 and OAuth2
 * Shopify_ OAuth2
 * Skyrock_ OAuth1
 * Soundcloud_ OAuth2
 * Spotify_ OAuth2
-* ThisIsMyJam_ OAuth1
 * Stackoverflow_ OAuth2
 * Steam_ OpenID
 * Stocktwits_ OAuth2
@@ -87,7 +84,7 @@ or extend current one):
 * VK.com_ OpenAPI, OAuth2 and OAuth2 for Applications
 * Weibo_ OAuth2
 * Xing_ OAuth1
-* Yahoo_ OpenID and OAuth1
+* Yahoo_ OAuth2
 * Yammer_ OAuth2
 * Yandex_ OAuth1, OAuth2 and OpenID
 
@@ -143,7 +140,6 @@ section.
 .. _Mailru: https://mail.ru
 .. _MineID: https://www.mineid.org
 .. _Mixcloud: https://www.mixcloud.com
-.. _NaszaKlasa: https://developers.nk.pl/
 .. _NGPVAN ActionID: http://developers.ngpvan.com/action-id
 .. _Odnoklassniki: http://www.odnoklassniki.ru
 .. _Podio: https://podio.com
@@ -151,7 +147,6 @@ section.
 .. _Skyrock: https://skyrock.com
 .. _Soundcloud: https://soundcloud.com
 .. _Spotify: https://www.spotify.com
-.. _ThisIsMyJam: https://thisismyjam.com
 .. _Stocktwits: https://stocktwits.com
 .. _Stripe: https://stripe.com
 .. _Tripit: https://www.tripit.com
@@ -167,7 +162,6 @@ section.
 .. _Pinterest: https://www.pinterest.com
 .. _Stackoverflow: http://stackoverflow.com/
 .. _Steam: http://steamcommunity.com/
-.. _Rdio: https://www.rdio.com
 .. _Vimeo: https://vimeo.com/
 .. _Tumblr: http://www.tumblr.com/
 .. _Django: https://github.com/python-social-auth/social-app-django
diff --git a/docs/use_cases.rst b/docs/use_cases.rst
index 8dff49a7..8e7fe881 100644
--- a/docs/use_cases.rst
+++ b/docs/use_cases.rst
@@ -40,31 +40,6 @@ In your custom pipeline, retrieve it using::
     strategy.session_get('key')
 
 
-
-Retrieve Google+ Friends
-------------------------
-
-Google provides a `People API endpoint`_ to retrieve the people in your circles
-on Google+. In order to access that API first we need to define the needed
-scope::
-
-    SOCIAL_AUTH_GOOGLE_OAUTH2_SCOPE = [
-        'https://www.googleapis.com/auth/plus.login'
-    ]
-
-Once we have the ``access token`` we can call the API like this::
-
-    import requests
-
-    user = User.objects.get(...)
-    social = user.social_auth.get(provider='google-oauth2')
-    response = requests.get(
-        'https://www.googleapis.com/plus/v1/people/me/people/visible',
-        params={'access_token': social.extra_data['access_token']}
-    )
-    friends = response.json()['items']
-
-
 Associate users by email
 ------------------------