diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
deleted file mode 100644
index 59cd0da2..00000000
--- a/openstackclient/common/command.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#   Copyright 2012-2013 OpenStack, LLC.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License"); you may
-#   not use this file except in compliance with the License. You may obtain
-#   a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#   License for the specific language governing permissions and limitations
-#   under the License.
-#
-
-"""OpenStack base command"""
-
-from cliff import command
-
-
-class OpenStackCommand(command.Command):
-    """Base class for OpenStack commands."""
-    api = None
-
-    def run(self, parsed_args):
-        if not self.api:
-            return
-        else:
-            return super(OpenStackCommand, self).run(parsed_args)
diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index 46ab991b..aac69d8a 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class CreateAgent(show.ShowOne):
     """Create agent command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".CreateAgent")
 
     def get_parser(self, prog_name):
@@ -77,7 +76,6 @@ class CreateAgent(show.ShowOne):
 class DeleteAgent(command.Command):
     """Delete agent command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".DeleteAgent")
 
     def get_parser(self, prog_name):
@@ -98,7 +96,6 @@ class DeleteAgent(command.Command):
 class ListAgent(lister.Lister):
     """List agent command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListAgent")
 
     def get_parser(self, prog_name):
@@ -131,7 +128,6 @@ class ListAgent(lister.Lister):
 class SetAgent(show.ShowOne):
     """Set agent command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".SetAgent")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/console.py b/openstackclient/compute/v2/console.py
index 8ed0d7f2..a67b004c 100644
--- a/openstackclient/compute/v2/console.py
+++ b/openstackclient/compute/v2/console.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class ShowConsoleLog(command.Command):
     """Show console-log command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ShowConsoleLog')
 
     def get_parser(self, prog_name):
@@ -65,7 +64,6 @@ class ShowConsoleLog(command.Command):
 class ShowConsoleURL(show.ShowOne):
     """Show console-url command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ShowConsoleURL')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/fixedip.py b/openstackclient/compute/v2/fixedip.py
index d0687fd7..c41fed45 100644
--- a/openstackclient/compute/v2/fixedip.py
+++ b/openstackclient/compute/v2/fixedip.py
@@ -25,7 +25,6 @@ from openstackclient.common import utils
 class AddFixedIP(command.Command):
     """Add fixed-ip command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".AddFixedIP")
 
     def get_parser(self, prog_name):
@@ -59,7 +58,6 @@ class AddFixedIP(command.Command):
 class RemoveFixedIP(command.Command):
     """Remove fixed-ip command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".RemoveFixedIP")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 1c6d3e3a..4d53a412 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class CreateFlavor(show.ShowOne):
     """Create flavor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".CreateFlavor")
 
     def get_parser(self, prog_name):
@@ -117,7 +116,6 @@ class CreateFlavor(show.ShowOne):
 class DeleteFlavor(command.Command):
     """Delete flavor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".DeleteFlavor")
 
     def get_parser(self, prog_name):
@@ -140,7 +138,6 @@ class DeleteFlavor(command.Command):
 class ListFlavor(lister.Lister):
     """List flavor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListFlavor")
 
     def take_action(self, parsed_args):
@@ -168,7 +165,6 @@ class ListFlavor(lister.Lister):
 class ShowFlavor(show.ShowOne):
     """Show flavor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ShowFlavor")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/floatingip.py b/openstackclient/compute/v2/floatingip.py
index 5a4b5f9a..1b07beb3 100644
--- a/openstackclient/compute/v2/floatingip.py
+++ b/openstackclient/compute/v2/floatingip.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class AddFloatingIP(command.Command):
     """Add floating-ip command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".AddFloatingIP")
 
     def get_parser(self, prog_name):
@@ -58,7 +57,6 @@ class AddFloatingIP(command.Command):
 class CreateFloatingIP(show.ShowOne):
     """Create floating-ip command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.CreateFloatingIP')
 
     def get_parser(self, prog_name):
@@ -83,7 +81,6 @@ class CreateFloatingIP(show.ShowOne):
 class DeleteFloatingIP(command.Command):
     """Delete floating-ip command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.DeleteFloatingIP')
 
     def get_parser(self, prog_name):
@@ -111,7 +108,6 @@ class DeleteFloatingIP(command.Command):
 class ListFloatingIP(lister.Lister):
     """List floating-ip command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ListFloatingIP')
 
     def take_action(self, parsed_args):
@@ -132,7 +128,6 @@ class ListFloatingIP(lister.Lister):
 class RemoveFloatingIP(command.Command):
     """Remove floating-ip command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".RemoveFloatingIP")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/floatingippool.py b/openstackclient/compute/v2/floatingippool.py
index 54814e04..e1da97c3 100644
--- a/openstackclient/compute/v2/floatingippool.py
+++ b/openstackclient/compute/v2/floatingippool.py
@@ -25,7 +25,6 @@ from openstackclient.common import utils
 class ListFloatingIPPool(lister.Lister):
     """List floating-ip-pool command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ListFloatingIPPool')
 
     def take_action(self, parsed_args):
diff --git a/openstackclient/compute/v2/host.py b/openstackclient/compute/v2/host.py
index f9c23a42..44f457d9 100644
--- a/openstackclient/compute/v2/host.py
+++ b/openstackclient/compute/v2/host.py
@@ -25,7 +25,6 @@ from openstackclient.common import utils
 class ListHost(lister.Lister):
     """List host command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListHost")
 
     def get_parser(self, prog_name):
@@ -54,7 +53,6 @@ class ListHost(lister.Lister):
 class ShowHost(lister.Lister):
     """Show host command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ShowHost")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/hypervisor.py b/openstackclient/compute/v2/hypervisor.py
index 35866aec..ad69d328 100644
--- a/openstackclient/compute/v2/hypervisor.py
+++ b/openstackclient/compute/v2/hypervisor.py
@@ -26,7 +26,6 @@ from openstackclient.common import utils
 class ListHypervisor(lister.Lister):
     """List hypervisor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListHypervisor")
 
     def get_parser(self, prog_name):
@@ -60,7 +59,6 @@ class ListHypervisor(lister.Lister):
 class ShowHypervisor(show.ShowOne):
     """Show hypervisor command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ShowHypervisor")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/keypair.py b/openstackclient/compute/v2/keypair.py
index 7987574f..65f3679b 100644
--- a/openstackclient/compute/v2/keypair.py
+++ b/openstackclient/compute/v2/keypair.py
@@ -30,7 +30,6 @@ from openstackclient.common import utils
 class CreateKeypair(show.ShowOne):
     """Create keypair command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + '.CreateKeypair')
 
     def get_parser(self, prog_name):
@@ -81,7 +80,6 @@ class CreateKeypair(show.ShowOne):
 class DeleteKeypair(command.Command):
     """Delete keypair command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + '.DeleteKeypair')
 
     def get_parser(self, prog_name):
@@ -103,7 +101,6 @@ class DeleteKeypair(command.Command):
 class ListKeypair(lister.Lister):
     """List keypair command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListKeypair")
 
     def take_action(self, parsed_args):
@@ -124,7 +121,6 @@ class ListKeypair(lister.Lister):
 class ShowKeypair(show.ShowOne):
     """Show keypair command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ShowKeypair')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 8b134aa9..e78144b0 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -118,7 +118,6 @@ def _wait_for_status(poll_fn, obj_id, final_ok_states, poll_period=5,
 class CreateServer(show.ShowOne):
     """Create server command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + '.CreateServer')
 
     def get_parser(self, prog_name):
@@ -318,7 +317,6 @@ class CreateServer(show.ShowOne):
 class DeleteServer(command.Command):
     """Delete server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.DeleteServer')
 
     def get_parser(self, prog_name):
@@ -341,7 +339,6 @@ class DeleteServer(command.Command):
 class ListServer(lister.Lister):
     """List server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ListServer')
 
     def get_parser(self, prog_name):
@@ -419,7 +416,6 @@ class ListServer(lister.Lister):
 class PauseServer(command.Command):
     """Pause server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.PauseServer')
 
     def get_parser(self, prog_name):
@@ -442,7 +438,6 @@ class PauseServer(command.Command):
 class RebootServer(command.Command):
     """Reboot server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.RebootServer')
 
     def get_parser(self, prog_name):
@@ -490,7 +485,6 @@ class RebootServer(command.Command):
 class RebuildServer(show.ShowOne):
     """Rebuild server command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + '.RebuildServer')
 
     def get_parser(self, prog_name):
@@ -545,7 +539,6 @@ class RebuildServer(show.ShowOne):
 class ResumeServer(command.Command):
     """Resume server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.ResumeServer')
 
     def get_parser(self, prog_name):
@@ -592,7 +585,6 @@ class ShowServer(show.ShowOne):
 class SuspendServer(command.Command):
     """Suspend server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.SuspendServer')
 
     def get_parser(self, prog_name):
@@ -615,7 +607,6 @@ class SuspendServer(command.Command):
 class UnpauseServer(command.Command):
     """Unpause server command"""
 
-    api = 'compute'
     log = logging.getLogger(__name__ + '.UnpauseServer')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/compute/v2/service.py b/openstackclient/compute/v2/service.py
index 5dac0e1c..5e57e0aa 100644
--- a/openstackclient/compute/v2/service.py
+++ b/openstackclient/compute/v2/service.py
@@ -25,7 +25,6 @@ from openstackclient.common import utils
 class ListService(lister.Lister):
     """List service command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".ListService")
 
     def get_parser(self, prog_name):
@@ -62,7 +61,6 @@ class ListService(lister.Lister):
 class SetService(lister.Lister):
     """Set service command"""
 
-    api = "compute"
     log = logging.getLogger(__name__ + ".SetService")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py
index 6a5d2af3..953a3de6 100644
--- a/openstackclient/identity/v2_0/ec2creds.py
+++ b/openstackclient/identity/v2_0/ec2creds.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class CreateEC2Creds(show.ShowOne):
     """Create EC2 credentials"""
 
-    api = "identity"
     log = logging.getLogger(__name__ + ".CreateEC2Creds")
 
     def get_parser(self, prog_name):
@@ -75,7 +74,6 @@ class CreateEC2Creds(show.ShowOne):
 class DeleteEC2Creds(command.Command):
     """Delete EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEC2Creds')
 
     def get_parser(self, prog_name):
@@ -111,7 +109,6 @@ class DeleteEC2Creds(command.Command):
 class ListEC2Creds(lister.Lister):
     """List EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEC2Creds')
 
     def get_parser(self, prog_name):
@@ -148,7 +145,6 @@ class ListEC2Creds(lister.Lister):
 class ShowEC2Creds(show.ShowOne):
     """Show EC2 credentials"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEC2Creds')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index 4ce4fcb2..680465ae 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -29,7 +29,6 @@ from openstackclient.common import utils
 class CreateEndpoint(show.ShowOne):
     """Create endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateEndpoint')
 
     def get_parser(self, prog_name):
@@ -78,7 +77,6 @@ class CreateEndpoint(show.ShowOne):
 class DeleteEndpoint(command.Command):
     """Delete endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEndpoint')
 
     def get_parser(self, prog_name):
@@ -99,7 +97,6 @@ class DeleteEndpoint(command.Command):
 class ListEndpoint(lister.Lister):
     """List endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEndpoint')
 
     def get_parser(self, prog_name):
@@ -136,7 +133,6 @@ class ListEndpoint(lister.Lister):
 class ShowEndpoint(show.ShowOne):
     """Show endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEndpoint')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 5c905d91..867230b6 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class AddRole(show.ShowOne):
     """Add role to tenant:user"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddRole')
 
     def get_parser(self, prog_name):
@@ -68,7 +67,6 @@ class AddRole(show.ShowOne):
 class CreateRole(show.ShowOne):
     """Create new role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRole')
 
     def get_parser(self, prog_name):
@@ -92,7 +90,6 @@ class CreateRole(show.ShowOne):
 class DeleteRole(command.Command):
     """Delete existing role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteRole')
 
     def get_parser(self, prog_name):
@@ -114,7 +111,6 @@ class DeleteRole(command.Command):
 class ListRole(lister.Lister):
     """List roles"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListRole')
 
     def take_action(self, parsed_args):
@@ -131,7 +127,6 @@ class ListRole(lister.Lister):
 class ListUserRole(lister.Lister):
     """List user-role assignments"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUserRole')
 
     def get_parser(self, prog_name):
@@ -181,7 +176,6 @@ class ListUserRole(lister.Lister):
 class RemoveRole(command.Command):
     """Remove role from tenant:user"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveRole')
 
     def get_parser(self, prog_name):
@@ -218,7 +212,6 @@ class RemoveRole(command.Command):
 class ShowRole(show.ShowOne):
     """Show single role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowRole')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 51abfc18..9940cb91 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -29,7 +29,6 @@ from openstackclient.common import utils
 class CreateService(show.ShowOne):
     """Create service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateService')
 
     def get_parser(self, prog_name):
@@ -65,7 +64,6 @@ class CreateService(show.ShowOne):
 class DeleteService(command.Command):
     """Delete service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteService')
 
     def get_parser(self, prog_name):
@@ -86,7 +84,6 @@ class DeleteService(command.Command):
 class ListService(lister.Lister):
     """List service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListService')
 
     def get_parser(self, prog_name):
@@ -115,7 +112,6 @@ class ListService(lister.Lister):
 class ShowService(show.ShowOne):
     """Show service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowService')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/tenant.py b/openstackclient/identity/v2_0/tenant.py
index 00a6a977..c9a423c5 100644
--- a/openstackclient/identity/v2_0/tenant.py
+++ b/openstackclient/identity/v2_0/tenant.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateTenant(show.ShowOne):
     """Create tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateTenant')
 
     def get_parser(self, prog_name):
@@ -71,7 +70,6 @@ class CreateTenant(show.ShowOne):
 class DeleteTenant(command.Command):
     """Delete tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteTenant')
 
     def get_parser(self, prog_name):
@@ -94,7 +92,6 @@ class DeleteTenant(command.Command):
 class ListTenant(lister.Lister):
     """List tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListTenant')
 
     def get_parser(self, prog_name):
@@ -123,7 +120,6 @@ class ListTenant(lister.Lister):
 class SetTenant(command.Command):
     """Set tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetTenant')
 
     def get_parser(self, prog_name):
@@ -177,7 +173,6 @@ class SetTenant(command.Command):
 class ShowTenant(show.ShowOne):
     """Show tenant command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowTenant')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 03da6008..39be81af 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateUser(show.ShowOne):
     """Create user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateUser')
 
     def get_parser(self, prog_name):
@@ -86,7 +85,6 @@ class CreateUser(show.ShowOne):
 class DeleteUser(command.Command):
     """Delete user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteUser')
 
     def get_parser(self, prog_name):
@@ -108,7 +106,6 @@ class DeleteUser(command.Command):
 class ListUser(lister.Lister):
     """List user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUser')
 
     def get_parser(self, prog_name):
@@ -141,7 +138,6 @@ class ListUser(lister.Lister):
 class SetUser(command.Command):
     """Set user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetUser')
 
     def get_parser(self, prog_name):
@@ -206,7 +202,6 @@ class SetUser(command.Command):
 class ShowUser(show.ShowOne):
     """Show user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowUser')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py
index c9826052..a2fb43a2 100644
--- a/openstackclient/identity/v3/credential.py
+++ b/openstackclient/identity/v3/credential.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateCredential(show.ShowOne):
     """Create credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateCredential')
 
     def get_parser(self, prog_name):
@@ -79,7 +78,6 @@ class CreateCredential(show.ShowOne):
 class DeleteCredential(command.Command):
     """Delete credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteCredential')
 
     def get_parser(self, prog_name):
@@ -101,7 +99,6 @@ class DeleteCredential(command.Command):
 class ListCredential(lister.Lister):
     """List credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListCredential')
 
     def take_action(self, parsed_args):
@@ -118,7 +115,6 @@ class ListCredential(lister.Lister):
 class SetCredential(command.Command):
     """Set credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetCredential')
 
     def get_parser(self, prog_name):
@@ -178,7 +174,6 @@ class SetCredential(command.Command):
 class ShowCredential(show.ShowOne):
     """Show credential command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowCredential')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py
index e3eaec2f..f6064a58 100644
--- a/openstackclient/identity/v3/domain.py
+++ b/openstackclient/identity/v3/domain.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateDomain(show.ShowOne):
     """Create domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateDomain')
 
     def get_parser(self, prog_name):
@@ -72,7 +71,6 @@ class CreateDomain(show.ShowOne):
 class DeleteDomain(command.Command):
     """Delete domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteDomain')
 
     def get_parser(self, prog_name):
@@ -96,7 +94,6 @@ class DeleteDomain(command.Command):
 class ListDomain(lister.Lister):
     """List domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListDomain')
 
     def take_action(self, parsed_args):
@@ -113,7 +110,6 @@ class ListDomain(lister.Lister):
 class SetDomain(command.Command):
     """Set domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetDomain')
 
     def get_parser(self, prog_name):
@@ -172,7 +168,6 @@ class SetDomain(command.Command):
 class ShowDomain(show.ShowOne):
     """Show domain command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowDomain')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py
index 4d9b6808..c5f3ebad 100644
--- a/openstackclient/identity/v3/endpoint.py
+++ b/openstackclient/identity/v3/endpoint.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateEndpoint(show.ShowOne):
     """Create endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateEndpoint')
 
     def get_parser(self, prog_name):
@@ -90,7 +89,6 @@ class CreateEndpoint(show.ShowOne):
 class DeleteEndpoint(command.Command):
     """Delete endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteEndpoint')
 
     def get_parser(self, prog_name):
@@ -113,7 +111,6 @@ class DeleteEndpoint(command.Command):
 class ListEndpoint(lister.Lister):
     """List endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListEndpoint')
 
     def get_parser(self, prog_name):
@@ -150,7 +147,6 @@ class ListEndpoint(lister.Lister):
 class SetEndpoint(command.Command):
     """Set endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetEndpoint')
 
     def get_parser(self, prog_name):
@@ -220,7 +216,6 @@ class SetEndpoint(command.Command):
 class ShowEndpoint(show.ShowOne):
     """Show endpoint command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowEndpoint')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 21d73966..ca0493eb 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AddUserToGroup(command.Command):
     """Add user to group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddUserToGroup')
 
     def get_parser(self, prog_name):
@@ -67,7 +66,6 @@ class AddUserToGroup(command.Command):
 class CheckUserInGroup(command.Command):
     """Checks that user is in a specific group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CheckUserInGroup')
 
     def get_parser(self, prog_name):
@@ -106,7 +104,6 @@ class CheckUserInGroup(command.Command):
 class CreateGroup(show.ShowOne):
     """Create group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateGroup')
 
     def get_parser(self, prog_name):
@@ -147,7 +144,6 @@ class CreateGroup(show.ShowOne):
 class DeleteGroup(command.Command):
     """Delete group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteGroup')
 
     def get_parser(self, prog_name):
@@ -169,7 +165,6 @@ class DeleteGroup(command.Command):
 class ListGroup(lister.Lister):
     """List groups and optionally roles assigned to groups"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListGroup')
 
     def get_parser(self, prog_name):
@@ -279,7 +274,6 @@ class ListGroup(lister.Lister):
 class RemoveUserFromGroup(command.Command):
     """Remove user to group"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveUserFromGroup')
 
     def get_parser(self, prog_name):
@@ -318,7 +312,6 @@ class RemoveUserFromGroup(command.Command):
 class SetGroup(command.Command):
     """Set group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetGroup')
 
     def get_parser(self, prog_name):
@@ -365,7 +358,6 @@ class SetGroup(command.Command):
 class ShowGroup(show.ShowOne):
     """Show group command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowGroup')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/oauth.py b/openstackclient/identity/v3/oauth.py
index 0b5ae4db..1e803e15 100644
--- a/openstackclient/identity/v3/oauth.py
+++ b/openstackclient/identity/v3/oauth.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AuthorizeRequestToken(show.ShowOne):
     """Authorize request token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AuthorizeRequestToken')
 
     def get_parser(self, prog_name):
@@ -68,7 +67,6 @@ class AuthorizeRequestToken(show.ShowOne):
 class CreateAccessToken(show.ShowOne):
     """Create access token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateAccessToken')
 
     def get_parser(self, prog_name):
@@ -107,7 +105,6 @@ class CreateAccessToken(show.ShowOne):
 class CreateConsumer(show.ShowOne):
     """Create consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateConsumer')
 
     def get_parser(self, prog_name):
@@ -133,7 +130,6 @@ class CreateConsumer(show.ShowOne):
 class CreateRequestToken(show.ShowOne):
     """Create request token command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRequestToken')
 
     def get_parser(self, prog_name):
@@ -164,7 +160,6 @@ class CreateRequestToken(show.ShowOne):
 class DeleteConsumer(command.Command):
     """Delete consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteConsumer')
 
     def get_parser(self, prog_name):
@@ -188,7 +183,6 @@ class DeleteConsumer(command.Command):
 class ListConsumer(lister.Lister):
     """List consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListConsumer')
 
     def take_action(self, parsed_args):
@@ -205,7 +199,6 @@ class ListConsumer(lister.Lister):
 class SetConsumer(command.Command):
     """Set consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetConsumer')
 
     def get_parser(self, prog_name):
@@ -241,7 +234,6 @@ class SetConsumer(command.Command):
 class ShowConsumer(show.ShowOne):
     """Show consumer command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowConsumer')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py
index ccfc3635..ac14cc46 100644
--- a/openstackclient/identity/v3/policy.py
+++ b/openstackclient/identity/v3/policy.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreatePolicy(show.ShowOne):
     """Create policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreatePolicy')
 
     def get_parser(self, prog_name):
@@ -61,7 +60,6 @@ class CreatePolicy(show.ShowOne):
 class DeletePolicy(command.Command):
     """Delete policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeletePolicy')
 
     def get_parser(self, prog_name):
@@ -83,7 +81,6 @@ class DeletePolicy(command.Command):
 class ListPolicy(lister.Lister):
     """List policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListPolicy')
 
     def get_parser(self, prog_name):
@@ -113,7 +110,6 @@ class ListPolicy(lister.Lister):
 class SetPolicy(command.Command):
     """Set policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetPolicy')
 
     def get_parser(self, prog_name):
@@ -159,7 +155,6 @@ class SetPolicy(command.Command):
 class ShowPolicy(show.ShowOne):
     """Show policy command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowPolicy')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py
index 84271cd9..9d1e360b 100644
--- a/openstackclient/identity/v3/project.py
+++ b/openstackclient/identity/v3/project.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateProject(show.ShowOne):
     """Create project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateProject')
 
     def get_parser(self, prog_name):
@@ -85,7 +84,6 @@ class CreateProject(show.ShowOne):
 class DeleteProject(command.Command):
     """Delete project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteProject')
 
     def get_parser(self, prog_name):
@@ -108,7 +106,6 @@ class DeleteProject(command.Command):
 class ListProject(lister.Lister):
     """List project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListProject')
 
     def get_parser(self, prog_name):
@@ -137,7 +134,6 @@ class ListProject(lister.Lister):
 class SetProject(command.Command):
     """Set project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetProject')
 
     def get_parser(self, prog_name):
@@ -199,7 +195,6 @@ class SetProject(command.Command):
 class ShowProject(show.ShowOne):
     """Show project command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowProject')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py
index 7387509a..9be3b784 100644
--- a/openstackclient/identity/v3/role.py
+++ b/openstackclient/identity/v3/role.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class AddRole(command.Command):
     """Adds a role to a user or group on a domain or project"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.AddRole')
 
     def get_parser(self, prog_name):
@@ -108,7 +107,6 @@ class AddRole(command.Command):
 class CreateRole(show.ShowOne):
     """Create new role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateRole')
 
     def get_parser(self, prog_name):
@@ -131,7 +129,6 @@ class CreateRole(show.ShowOne):
 class DeleteRole(command.Command):
     """Delete existing role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteRole')
 
     def get_parser(self, prog_name):
@@ -155,7 +152,6 @@ class DeleteRole(command.Command):
 class ListRole(lister.Lister):
     """List roles"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListRole')
 
     def take_action(self, parsed_args):
@@ -172,7 +168,6 @@ class ListRole(lister.Lister):
 class RemoveRole(command.Command):
     """Remove role command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.RemoveRole')
 
     def get_parser(self, prog_name):
@@ -251,7 +246,6 @@ class RemoveRole(command.Command):
 class SetRole(command.Command):
     """Set role command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetRole')
 
     def get_parser(self, prog_name):
@@ -285,7 +279,6 @@ class SetRole(command.Command):
 class ShowRole(show.ShowOne):
     """Show single role"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowRole')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py
index 023c858e..5c82284c 100644
--- a/openstackclient/identity/v3/service.py
+++ b/openstackclient/identity/v3/service.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateService(show.ShowOne):
     """Create service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateService')
 
     def get_parser(self, prog_name):
@@ -69,7 +68,6 @@ class CreateService(show.ShowOne):
 class DeleteService(command.Command):
     """Delete service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteService')
 
     def get_parser(self, prog_name):
@@ -94,7 +92,6 @@ class DeleteService(command.Command):
 class ListService(lister.Lister):
     """List service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListService')
 
     def take_action(self, parsed_args):
@@ -111,7 +108,6 @@ class ListService(lister.Lister):
 class SetService(show.ShowOne):
     """Set service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetService')
 
     def get_parser(self, prog_name):
@@ -165,7 +161,6 @@ class SetService(show.ShowOne):
 class ShowService(show.ShowOne):
     """Show service command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowService')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py
index 53550cda..aac70274 100644
--- a/openstackclient/identity/v3/user.py
+++ b/openstackclient/identity/v3/user.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateUser(show.ShowOne):
     """Create user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.CreateUser')
 
     def get_parser(self, prog_name):
@@ -113,7 +112,6 @@ class CreateUser(show.ShowOne):
 class DeleteUser(command.Command):
     """Delete user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.DeleteUser')
 
     def get_parser(self, prog_name):
@@ -137,7 +135,6 @@ class DeleteUser(command.Command):
 class ListUser(lister.Lister):
     """List users and optionally roles assigned to users"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ListUser')
 
     def get_parser(self, prog_name):
@@ -249,7 +246,6 @@ class ListUser(lister.Lister):
 class SetUser(command.Command):
     """Set user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.SetUser')
 
     def get_parser(self, prog_name):
@@ -338,7 +334,6 @@ class SetUser(command.Command):
 class ShowUser(show.ShowOne):
     """Show user command"""
 
-    api = 'identity'
     log = logging.getLogger(__name__ + '.ShowUser')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 43cae21c..5b4a939d 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -30,7 +30,6 @@ from cliff import show
 class CreateImage(show.ShowOne):
     """Create image command"""
 
-    api = "image"
     log = logging.getLogger(__name__ + ".CreateImage")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
index 3b9b349d..61273aa2 100644
--- a/openstackclient/image/v2/image.py
+++ b/openstackclient/image/v2/image.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class DeleteImage(command.Command):
     """Delete image command"""
 
-    api = "image"
     log = logging.getLogger(__name__ + ".DeleteImage")
 
     def get_parser(self, prog_name):
@@ -49,7 +48,6 @@ class DeleteImage(command.Command):
 class ListImage(lister.Lister):
     """List image command"""
 
-    api = "image"
     log = logging.getLogger(__name__ + ".ListImage")
 
     def get_parser(self, prog_name):
@@ -78,7 +76,6 @@ class ListImage(lister.Lister):
 class SaveImage(command.Command):
     """Save image command"""
 
-    api = "image"
     log = logging.getLogger(__name__ + ".SaveImage")
 
     def get_parser(self, prog_name):
@@ -107,7 +104,6 @@ class SaveImage(command.Command):
 class ShowImage(show.ShowOne):
     """Show image command"""
 
-    api = "image"
     log = logging.getLogger(__name__ + ".ShowImage")
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/volume/v1/backup.py b/openstackclient/volume/v1/backup.py
index cd1afd60..8ef666c1 100644
--- a/openstackclient/volume/v1/backup.py
+++ b/openstackclient/volume/v1/backup.py
@@ -27,7 +27,6 @@ from openstackclient.common import utils
 class CreateBackup(show.ShowOne):
     """Create backup command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.CreateBackup')
 
     def get_parser(self, prog_name):
@@ -75,7 +74,6 @@ class CreateBackup(show.ShowOne):
 class DeleteBackup(command.Command):
     """Delete backup command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.DeleteBackup')
 
     def get_parser(self, prog_name):
@@ -99,7 +97,6 @@ class DeleteBackup(command.Command):
 class ListBackup(lister.Lister):
     """List backup command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ListBackup')
 
     def take_action(self, parsed_args):
@@ -122,7 +119,6 @@ class ListBackup(lister.Lister):
 class RestoreBackup(command.Command):
     """Restore backup command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.RestoreBackup')
 
     def get_parser(self, prog_name):
@@ -151,7 +147,6 @@ class RestoreBackup(command.Command):
 class ShowBackup(show.ShowOne):
     """Show backup command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ShowBackup')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/volume/v1/snapshot.py b/openstackclient/volume/v1/snapshot.py
index a4cf86bf..6055a4d8 100644
--- a/openstackclient/volume/v1/snapshot.py
+++ b/openstackclient/volume/v1/snapshot.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateSnapshot(show.ShowOne):
     """Create snapshot command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.CreateSnapshot')
 
     def get_parser(self, prog_name):
@@ -76,7 +75,6 @@ class CreateSnapshot(show.ShowOne):
 class DeleteSnapshot(command.Command):
     """Delete snapshot command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.DeleteSnapshot')
 
     def get_parser(self, prog_name):
@@ -100,7 +98,6 @@ class DeleteSnapshot(command.Command):
 class ListSnapshot(lister.Lister):
     """List snapshot command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ListSnapshot')
 
     def take_action(self, parsed_args):
@@ -123,7 +120,6 @@ class ListSnapshot(lister.Lister):
 class SetSnapshot(command.Command):
     """Set snapshot command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.SetSnapshot')
 
     def get_parser(self, prog_name):
@@ -163,7 +159,6 @@ class SetSnapshot(command.Command):
 class ShowSnapshot(show.ShowOne):
     """Show snapshot command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ShowSnapshot')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/volume/v1/type.py b/openstackclient/volume/v1/type.py
index e146ee3f..dab21d99 100644
--- a/openstackclient/volume/v1/type.py
+++ b/openstackclient/volume/v1/type.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateVolumeType(show.ShowOne):
     """Create volume type command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.CreateVolumeType')
 
     def get_parser(self, prog_name):
@@ -55,7 +54,6 @@ class CreateVolumeType(show.ShowOne):
 class DeleteVolumeType(command.Command):
     """Delete volume type command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.DeleteVolumeType')
 
     def get_parser(self, prog_name):
@@ -79,7 +77,6 @@ class DeleteVolumeType(command.Command):
 class ListVolumeType(lister.Lister):
     """List volume type command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ListVolumeType')
 
     def get_parser(self, prog_name):
@@ -108,7 +105,6 @@ class ListVolumeType(lister.Lister):
 class SetVolumeType(command.Command):
     """Set volume type command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.SetVolumeType')
 
     def get_parser(self, prog_name):
@@ -142,7 +138,6 @@ class SetVolumeType(command.Command):
 class UnsetVolumeType(command.Command):
     """Unset volume type command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.UnsetVolumeType')
 
     def get_parser(self, prog_name):
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py
index 43253c40..f1e421f4 100644
--- a/openstackclient/volume/v1/volume.py
+++ b/openstackclient/volume/v1/volume.py
@@ -28,7 +28,6 @@ from openstackclient.common import utils
 class CreateVolume(show.ShowOne):
     """Create volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.CreateVolume')
 
     def get_parser(self, prog_name):
@@ -127,7 +126,6 @@ class CreateVolume(show.ShowOne):
 class DeleteVolume(command.Command):
     """Delete volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.DeleteVolume')
 
     def get_parser(self, prog_name):
@@ -161,7 +159,6 @@ class DeleteVolume(command.Command):
 class ListVolume(lister.Lister):
     """List volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ListVolume')
 
     def get_parser(self, prog_name):
@@ -218,7 +215,6 @@ class ListVolume(lister.Lister):
 class SetVolume(command.Command):
     """Set volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.SetVolume')
 
     def get_parser(self, prog_name):
@@ -274,7 +270,6 @@ class SetVolume(command.Command):
 class ShowVolume(show.ShowOne):
     """Show volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.ShowVolume')
 
     def get_parser(self, prog_name):
@@ -297,7 +292,6 @@ class ShowVolume(show.ShowOne):
 class UnsetVolume(command.Command):
     """Unset volume command"""
 
-    api = 'volume'
     log = logging.getLogger(__name__ + '.UnsetVolume')
 
     def get_parser(self, prog_name):