diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index 82fca57b..97bc5b2e 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -879,7 +879,6 @@ gam info resoldsubscriptions <CustomerID> [customer_auth_token <String>]
 	device_management|
 	drive|
 	gmail|
-	gplus|
 	meet|
 	mobile|
 	sites
@@ -929,8 +928,7 @@ gam info customer
 
 <DataTransferService> ::=
 	calendar|
-	googledrive|gdrive|drive|"drive and docs"|
-	gplus|googleplus|google+
+	googledrive|gdrive|drive|"drive and docs"
 <DataTransferServiceList> ::= "<DataTransferService>(,<DataTransferService>)*"
 
 gam create datatransfer|transfer <OldOwnerID> <DataTransferServiceList> <NewOwnerID> (<ParameterKey> <ParameterValue>)*
@@ -1254,7 +1252,6 @@ gam <UserTypeEntity> trash messages query <QueryGmail> [doit] [max_to_trash|max_
 gam <UserTypeEntity> untrash messages query <QueryGmail> [doit] [max_to_untrash|max_to_process <Number>]
 
 gam <UserTypeEntity> show gmailprofile [todrive]
-gam <UserTypeEntity> show gplusprofile [todrive]
 
 gam <UserTypeEntity> create|add delegate|delegates <EmailAddress>
 gam <UserTypeEntity> delegate|delegates to <EmailAddress>
diff --git a/src/var.py b/src/var.py
index 05f74c79..64fa7350 100644
--- a/src/var.py
+++ b/src/var.py
@@ -99,17 +99,17 @@ SKUS = {
 
 # Legacy APIs that use v1 discovery. Newer APIs should all use v2.
 V1_DISCOVERY_APIS = {
-  u'oauth2',
-  u'reseller',
-  u'storage',
-  u'drive',
   u'admin',
+  u'appsactivity',
+  u'calendar',
+  u'drive',
+  u'gmail',
   u'groupssettings',
   u'licensing',
-  u'calendar',
-  u'appsactivity',
+  u'oauth2',
+  u'reseller',
   u'siteVerification',
-  u'gmail',
+  u'storage',
   }
 
 API_VER_MAPPING = {
@@ -132,7 +132,6 @@ API_VER_MAPPING = {
   u'sheets': u'v4',
   u'siteVerification': u'v1',
   u'storage': u'v1',
-  u'urlshortener': u'v1',
   u'vault': u'v1',
   }
 
@@ -169,7 +168,6 @@ ADDRESS_FIELDS_ARGUMENT_MAP = {
 
 SERVICE_NAME_TO_ID_MAP = {
   u'Drive and Docs': u'55656082996',
-  u'Google+': u'553547912911',
   u'Calendar': u'435070579839'
   }
 
@@ -873,7 +871,6 @@ GAPI_USER_RATE_LIMIT_EXCEEDED = u'userRateLimitExceeded'
 #
 GAPI_DEFAULT_RETRY_REASONS = [GAPI_QUOTA_EXCEEDED, GAPI_RATE_LIMIT_EXCEEDED, GAPI_USER_RATE_LIMIT_EXCEEDED, GAPI_BACKEND_ERROR, GAPI_INTERNAL_ERROR]
 GAPI_GMAIL_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
-GAPI_GPLUS_THROW_REASONS = [GAPI_SERVICE_NOT_AVAILABLE]
 GAPI_GROUP_GET_THROW_REASONS = [GAPI_GROUP_NOT_FOUND, GAPI_DOMAIN_NOT_FOUND, GAPI_DOMAIN_CANNOT_USE_APIS, GAPI_FORBIDDEN, GAPI_BAD_REQUEST]
 GAPI_GROUP_GET_RETRY_REASONS = [GAPI_INVALID, GAPI_SYSTEM_ERROR]
 GAPI_MEMBERS_THROW_REASONS = [GAPI_GROUP_NOT_FOUND, GAPI_DOMAIN_NOT_FOUND, GAPI_DOMAIN_CANNOT_USE_APIS, GAPI_INVALID, GAPI_FORBIDDEN]