diff --git a/doc/common/samples/cinder.conf.sample b/doc/common/samples/cinder.conf.sample
index 43fdc80d25..38744bac49 100644
--- a/doc/common/samples/cinder.conf.sample
+++ b/doc/common/samples/cinder.conf.sample
@@ -999,10 +999,6 @@
 # value)
 #chiscsi_conf=/etc/chelsio-iscsi/chiscsi.conf
 
-# This option is deprecated and unused. It will be removed in
-# the next release. (string value)
-#lio_initiator_iqns=
-
 # Sets the behavior of the iSCSI target to either perform
 # blockio or fileio optionally, auto can be set and Cinder
 # will autodetect type of backing device (string value)
diff --git a/doc/common/tables/cinder-common.xml b/doc/common/tables/cinder-common.xml
index 338e3d2c37..77dcf9265b 100644
--- a/doc/common/tables/cinder-common.xml
+++ b/doc/common/tables/cinder-common.xml
@@ -85,10 +85,6 @@
         <td><option>iscsi_secondary_ip_addresses</option> = <replaceable></replaceable></td>
         <td>(ListOpt) The list of secondary IP addresses of the iSCSI daemon</td>
       </tr>
-      <tr>
-        <td><option>lio_initiator_iqns</option> = <replaceable></replaceable></td>
-        <td>(StrOpt) This option is deprecated and unused. It will be removed in the next release.</td>
-      </tr>
       <tr>
         <td><option>max_over_subscription_ratio</option> = <replaceable>20.0</replaceable></td>
         <td>(FloatOpt) Float representation of the over subscription ratio when thin provisioning is involved. Default ratio is 20.0, meaning provisioned capacity can be 20 times of the total physical capacity. If the ratio is 10.5, it means provisioned capacity can be 10.5 times of the total physical capacity. A ratio of 1.0 means provisioned capacity cannot exceed the total physical capacity. A ratio lower than 1.0 will be ignored and the default value will be used instead.</td>
diff --git a/tools/autogenerate-config-flagmappings/cinder.flagmappings b/tools/autogenerate-config-flagmappings/cinder.flagmappings
index a641cb2a2c..52837b72ed 100644
--- a/tools/autogenerate-config-flagmappings/cinder.flagmappings
+++ b/tools/autogenerate-config-flagmappings/cinder.flagmappings
@@ -251,7 +251,6 @@ lenovo_backend_name lenovo
 lenovo_backend_type lenovo
 lenovo_iscsi_ips lenovo
 lenovo_wbi_protocol lenovo
-lio_initiator_iqns common
 log_config_append logging
 log_date_format logging
 log_dir logging