diff --git a/molecules/3rdparty/mcs.common b/molecules/3rdparty/mcs.common
index 08337a1..0080810 100644
--- a/molecules/3rdparty/mcs.common
+++ b/molecules/3rdparty/mcs.common
@@ -50,10 +50,7 @@ packages_to_add:
 	net-mail/cyrus-imapd,
 	www-servers/apache[threads],
 	www-servers/jboss-bin:4.2,
-	net-mail/gnarwl,
-	rpm2targz,
-	nmap,
-	tcpdump
+	net-mail/gnarwl
 
 # Custom shell call to packages add (default is: equo install)
 custom_packages_add_cmd: equo install --relaxed
diff --git a/remaster/mcs/mcs-functions.sh b/remaster/mcs/mcs-functions.sh
index dec9e8e..00fe292 100755
--- a/remaster/mcs/mcs-functions.sh
+++ b/remaster/mcs/mcs-functions.sh
@@ -36,11 +36,11 @@ ServerAdminPwd=mcsmanager
 	su - -c "/usr/sbin/setup-ds-admin.pl -f ${tmp_config_file} --silent" || return 1
 
 	# init MCS ldap data
-	( /usr/sbin/mcs-ldapinit.pl -d localhost.localdomain -b "dc=babel,dc=it" \
-		-s sa -p mcsmanager -a node1 -B "db1,db2" > /tmp/base.ldif ) || return 1
-	/usr/bin/ldapmodify -a -D "cn=directory manager" -w mcsmanager \
-		-f /tmp/base.ldif || return 1
-	rm -f /tmp/base.ldif &> /dev/null
+	# TODO
+	#( /usr/sbin/mcs-ldapinit.pl -d localhost.localdomain -b "dc=babel,dc=it" \
+	#	-s sa -p mcsmanager -a node1 -B "db1,db2" -f /tmp/base.ldif ) || return 1
+	#/usr/bin/ldapmodify -a -D "cn=directory manager" -h localhost -w mcsmanager \
+	#	-f /tmp/base.ldif || return 1
 
 	echo "389 Directory Server configured."
 	return 0
@@ -64,5 +64,9 @@ _setup_fds_installed() {
 
 setup_fds() {
 	# setup 389
-	( _is_live && _setup_fds_live ) || _setup_fds_installed
+	if _is_live; then
+		_setup_fds_live
+	else
+		_setup_fds_installed
+	fi
 }