diff --git a/requirements.txt b/requirements.txt
index 8b9cdc6..28bd16d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,6 @@
 # process, which may cause wedges in the gate later.
 
 pbr>=2.0 # Apache-2.0
-cliff>=2.8.0 # Apache-2.0
 osc-lib>=1.7.0 # Apache-2.0
 rsd-lib>=1.2.0 # Apache-2.0
 six>=1.10.0 # MIT
diff --git a/rsdclient/common/command.py b/rsdclient/common/command.py
index a5139bb..1c5a9a1 100644
--- a/rsdclient/common/command.py
+++ b/rsdclient/common/command.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-from cliff import _argparse
+import argparse
 
 from osc_lib.command import command
 
@@ -27,7 +27,7 @@ class Command(command.Command):
         return parser
 
 
-class _SmartHelpFormatter(_argparse.HelpFormatter):
+class _SmartHelpFormatter(argparse.HelpFormatter):
     """New smart argparse HelpFormatter
 
        Smart help formatter to output raw help message if it contains newline