diff --git a/contrib/fuel_bootstrap/files/trusty/etc/nailgun-agent/nodiscover b/contrib/fuel_bootstrap/files/trusty/etc/nailgun-agent/nodiscover
deleted file mode 100644
index e69de29b..00000000
diff --git a/contrib/fuel_bootstrap/files/trusty/etc/rc.local b/contrib/fuel_bootstrap/files/trusty/etc/rc.local
index 88d87bb9..81f17f6f 100755
--- a/contrib/fuel_bootstrap/files/trusty/etc/rc.local
+++ b/contrib/fuel_bootstrap/files/trusty/etc/rc.local
@@ -5,6 +5,3 @@ multipath-reload || true
 
 # Perform fuel bootstrap configuration
 fix-configs-on-startup || true
-
-# Unlocking nailgun-agent for discovering
-rm -f /etc/nailgun-agent/nodiscover
diff --git a/contrib/fuel_bootstrap/files/xenial/etc/nailgun-agent/nodiscover b/contrib/fuel_bootstrap/files/xenial/etc/nailgun-agent/nodiscover
deleted file mode 100644
index e69de29b..00000000
diff --git a/contrib/fuel_bootstrap/files/xenial/usr/bin/fix-configs-on-startup b/contrib/fuel_bootstrap/files/xenial/usr/bin/fix-configs-on-startup
index 9cf47e82..fc6a4ef5 100755
--- a/contrib/fuel_bootstrap/files/xenial/usr/bin/fix-configs-on-startup
+++ b/contrib/fuel_bootstrap/files/xenial/usr/bin/fix-configs-on-startup
@@ -64,7 +64,6 @@ systemctl restart ntp
 sed -i "s/^plugin.rabbitmq.pool.1.host\b.*$/plugin.rabbitmq.pool.1.host = $masternode_ip/" /etc/mcollective/server.cfg
 sed -i "s/^plugin.rabbitmq.pool.1.user\b.*$/plugin.rabbitmq.pool.1.user = $mco_user/" /etc/mcollective/server.cfg
 sed -i "s/^plugin.rabbitmq.pool.1.password\b.*$/plugin.rabbitmq.pool.1.password= $mco_pass/" /etc/mcollective/server.cfg
-rm -f /etc/nailgun-agent/nodiscover # this will be removed as soon as new nailgun agent is committed
 while true; do
     sleep 5
     grep --line-regexp "[[:digit:]]\+" /etc/nailgun_uid && break