diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 938dd05c..56ddcbad 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -199,8 +199,6 @@ class ClientManager(object):
 
         self._auth_setup_completed = True
 
-        return
-
     @property
     def auth_ref(self):
         """Dereference will trigger an auth if it hasn't already"""
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 08c09565..e92f5412 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -87,7 +87,6 @@ class DeleteEndpoint(command.Command):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         identity_client.endpoints.delete(parsed_args.endpoint)
-        return
 
 
 class ListEndpoint(command.Lister):
diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py
index 9e26c308..71c77623 100644
--- a/openstackclient/identity/v2_0/project.py
+++ b/openstackclient/identity/v2_0/project.py
@@ -119,7 +119,6 @@ class DeleteProject(command.Command):
                 project,
             )
             identity_client.tenants.delete(project_obj.id)
-        return
 
 
 class ListProject(command.Lister):
@@ -222,7 +221,6 @@ class SetProject(command.Command):
             del kwargs['name']
 
         identity_client.tenants.update(project.id, **kwargs)
-        return
 
 
 class ShowProject(command.ShowOne):
@@ -317,4 +315,3 @@ class UnsetProject(command.Command):
                 if key in kwargs:
                     kwargs[key] = None
             identity_client.tenants.update(project.id, **kwargs)
-        return
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 892ce006..01c34089 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -126,7 +126,6 @@ class DeleteRole(command.Command):
                 role,
             )
             identity_client.roles.delete(role_obj.id)
-        return
 
 
 class ListRole(command.Lister):
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 3af85d7d..0b1e8dbd 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -101,7 +101,6 @@ class DeleteService(command.Command):
         identity_client = self.app.client_manager.identity
         service = common.find_service(identity_client, parsed_args.service)
         identity_client.services.delete(service.id)
-        return
 
 
 class ListService(command.Lister):
diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py
index 6a66a1c6..1ccf2f26 100644
--- a/openstackclient/identity/v2_0/token.py
+++ b/openstackclient/identity/v2_0/token.py
@@ -55,4 +55,3 @@ class RevokeToken(command.Command):
         identity_client = self.app.client_manager.identity
 
         identity_client.tokens.delete(parsed_args.token)
-        return
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 3d848737..fc868bab 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -143,7 +143,6 @@ class DeleteUser(command.Command):
                 user,
             )
             identity_client.users.delete(user_obj.id)
-        return
 
 
 class ListUser(command.Lister):
@@ -330,7 +329,6 @@ class SetUser(command.Command):
             kwargs['enabled'] = False
 
         identity_client.users.update(user.id, **kwargs)
-        return
 
 
 class ShowUser(command.ShowOne):
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
index 308e0e52..67865642 100644
--- a/openstackclient/network/v2/network.py
+++ b/openstackclient/network/v2/network.py
@@ -338,7 +338,6 @@ class SetNetwork(command.Command):
             raise exceptions.CommandError(msg)
 
         client.update_network(obj, **attrs)
-        return
 
 
 class ShowNetwork(common.NetworkAndComputeShowOne):
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
index 9cefb420..62699ffd 100644
--- a/openstackclient/network/v2/security_group.py
+++ b/openstackclient/network/v2/security_group.py
@@ -123,7 +123,6 @@ class SetSecurityGroup(common.NetworkAndComputeCommand):
         # if there were no updates. Maintain this behavior and issue
         # the update.
         client.update_security_group(obj, **attrs)
-        return
 
     def take_action_compute(self, client, parsed_args):
         data = utils.find_resource(