diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index 2b13be35a..74f6b48d0 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -158,29 +158,6 @@ class OpenStackIdentityShell(object):
                                  "against any certificate authorities. This "
                                  "option should be used with caution.")
 
-        # FIXME(dtroyer): The args below are here for diablo compatibility,
-        #                 remove them in folsum cycle
-
-        parser.add_argument('--username',
-                            metavar='<auth-user-name>',
-                            help='Deprecated')
-
-        parser.add_argument('--password',
-                            metavar='<auth-password>',
-                            help='Deprecated')
-
-        parser.add_argument('--tenant_name',
-                            metavar='<tenant-name>',
-                            help='Deprecated')
-
-        parser.add_argument('--auth_url',
-                            metavar='<auth-url>',
-                            help='Deprecated')
-
-        parser.add_argument('--region_name',
-                            metavar='<region-name>',
-                            help='Deprecated')
-
         return parser
 
     def get_subcommand_parser(self, version):