diff --git a/devstack/etcd_driver b/devstack/etcd_driver
index 9a821189e..0873f5ea9 100644
--- a/devstack/etcd_driver
+++ b/devstack/etcd_driver
@@ -27,13 +27,13 @@ function configure_etcd_systemd_service {
     sudo install -d -o $STACK_USER $ETCD_CONF_DIR
     cp $DEST/dragonflow/devstack/etcd.service.conf $ETCD_CONF
 
-    iniset $ETCD_CONF   DEFAULT ETCD_INITIAL_CLUSTER "$HOSTNAME=http://$REMOTE_DB_IP:2380"
-    iniset $ETCD_CONF   DEFAULT ETCD_INITIAL_CLUSTER_STATE "new"
-    iniset $ETCD_CONF   DEFAULT ETCD_INITIAL_CLUSTER_TOKEN "etcd-cluster-01"
-    iniset $ETCD_CONF   DEFAULT ETCD_INITIAL_ADVERTISE_PEER_URLS "http://$REMOTE_DB_IP:2380"
-    iniset $ETCD_CONF   DEFAULT ETCD_DATA_DIR "$ETCD_DATA_DIR"
-    iniset $ETCD_CONF  DEFAULT ETCD_LISTEN_PEER_URLS "http://0.0.0.0:2380"
-    iniset $ETCD_CONF  DEFAULT ETCD_LISTEN_CLIENT_URLS "http://$REMOTE_DB_IP:4001"
+    iniset $ETCD_CONF DEFAULT ETCD_INITIAL_CLUSTER "$HOSTNAME=http://$REMOTE_DB_IP:2380"
+    iniset $ETCD_CONF DEFAULT ETCD_INITIAL_CLUSTER_STATE "new"
+    iniset $ETCD_CONF DEFAULT ETCD_INITIAL_CLUSTER_TOKEN "etcd-cluster-01"
+    iniset $ETCD_CONF DEFAULT ETCD_INITIAL_ADVERTISE_PEER_URLS "http://$REMOTE_DB_IP:2380"
+    iniset $ETCD_CONF DEFAULT ETCD_DATA_DIR "$ETCD_DATA_DIR"
+    iniset $ETCD_CONF DEFAULT ETCD_LISTEN_PEER_URLS "http://0.0.0.0:2380"
+    iniset $ETCD_CONF DEFAULT ETCD_LISTEN_CLIENT_URLS "http://$REMOTE_DB_IP:4001"
     iniset $ETCD_CONF DEFAULT ETCD_ADVERTISE_CLIENT_URLS "http://$REMOTE_DB_IP:4001"
     iniset $ETCD_CONF DEFAULT ETCD_NAME "$HOSTNAME"
 
diff --git a/devstack/settings b/devstack/settings
index 75d2d0300..d1c05e092 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -6,8 +6,6 @@ DRAGONFLOW_REPO=${DRAGONFLOW_REPO:-git://github.com/openstack/dragonflow.git}
 DRAGONFLOW_DIR=$DEST/dragonflow
 DRAGONFLOW_BRANCH=${DRAGONFLOW_BRANCH:-master}
 
-DF_L3_SERVICE_PLUGIN="dragonflow.neutron.services.l3.l3_controller_plugin.ControllerL3ServicePlugin"
-
 DF_L3_BINARY=$NEUTRON_BIN_DIR/df-l3-agent
 DF_LOCAL_CONTROLLER_BINARY=$NEUTRON_BIN_DIR/df-local-controller
 DF_PUBLISHER_SERVICE_BINARY=$NEUTRON_BIN_DIR/df-publisher-service