diff --git a/resources/not_provisioned_node/templates/cloud-init-templates/boothook_centos.jinja2 b/resources/not_provisioned_node/templates/cloud-init-templates/boothook_centos.jinja2
index 732bf752..1be4a587 100644
--- a/resources/not_provisioned_node/templates/cloud-init-templates/boothook_centos.jinja2
+++ b/resources/not_provisioned_node/templates/cloud-init-templates/boothook_centos.jinja2
@@ -1,21 +1,10 @@
 #cloud-boothook
 #!/bin/bash
 
-function add_str_to_file_if_not_exists {
-    file=$1
-    str=$2
-    val=$3
-    if ! grep -q "^ *${str}" $file; then
-        echo $val >> $file
-    fi
-}
-
-
 cloud-init-per instance disable_selinux_on_the_fly setenforce 0
 
 cloud-init-per instance disable_selinux sed -i 's/^SELINUX=.*/SELINUX=disabled/g' /etc/sysconfig/selinux
 
-
 # configure udev rules
 
 # udev persistent net
@@ -64,46 +53,3 @@ cloud-init-per instance set_coredump /bin/sh -c 'echo -e "kernel.core_pattern=/v
 cloud-init-per instance set_coredump_sysctl sysctl -w "kernel.core_pattern=/var/log/coredump/core.%e.%p.%h.%t"
 cloud-init-per instance set_chmod chmod 777 /var/log/coredump
 cloud-init-per instance set_limits /bin/sh -c 'echo -e "* soft core unlimited\n* hard core unlimited" | tee -a /etc/security/limits.conf'
-
-
-#NOTE: disabled for centos?
-#cloud-init-per instance dhclient echo 'supersede routers 0;' | tee /etc/dhcp/dhclient.conf
-
-# ntp sync
-# '| tee /dev/null' is needed for returning zero execution code always
-cloud-init-per instance stop_ntpd /bin/sh -c 'service ntpd stop | tee /dev/null'
-cloud-init-per instance sync_date ntpdate -t 4 -b {{ common.master_ip }}
-cloud-init-per instance sync_hwclock hwclock --systohc
-
-cloud-init-per instance edit_ntp_conf1 sed -i '/^\s*tinker panic/ d' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf2 sed -i '1 i tinker panic 0' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf_mkdir mkdir -p /var/lib/ntp
-cloud-init-per instance edit_ntp_conf3 /bin/sh -c 'echo 0 | tee /var/lib/ntp/drift'
-cloud-init-per instance edit_ntp_conf4 chown ntp: /var/lib/ntp/drift
-cloud-init-per instance edit_ntp_conf5 sed -i '/^\s*server/ d' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf6 /bin/sh -c 'echo "server {{ common.master_ip }} burst iburst" | tee -a /etc/ntp.conf'
-
-
-# Point installed ntpd to Master node
-cloud-init-per instance set_ntpdate sed -i 's/SYNC_HWCLOCK\s*=\s*no/SYNC_HWCLOCK=yes/' /etc/sysconfig/ntpdate
-cloud-init-per instance set_ntpd_0 chkconfig ntpd on
-cloud-init-per instance set_ntpd_1 chkconfig ntpdate on
-cloud-init-per instance start_ntpd service ntpd start
-
-cloud-init-per instance removeUseDNS sed -i --follow-symlinks -e '/UseDNS/d' /etc/ssh/sshd_config
-add_str_to_file_if_not_exists /etc/ssh/sshd_config 'UseDNS' 'UseDNS no'
-
-cloud-init-per instance gssapi_disable sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" /etc/ssh/sshd_config
-
-cloud-init-per instance nailgun_agent_0 /bin/sh -c 'echo "rm -f /etc/nailgun-agent/nodiscover" | tee /etc/rc.local'
-cloud-init-per instance nailgun_agent_1 /bin/sh -c 'echo "flock -w 0 -o /var/lock/agent.lock -c \"/opt/nailgun/bin/agent >> /var/log/nailgun-agent.log 2>&1\"" | tee -a /etc/rc.local'
-
-# Copying default bash settings to the root directory
-cloud-init-per instance skel_bash cp -f /etc/skel/.bash* /root/
-
-# Puppet config
-cloud-init-per instance hiera_puppet mkdir -p /etc/puppet /var/lib/hiera
-cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
-
-# Mcollective enable
-cloud-init-per instance mcollective_enable sed -i /etc/rc.d/init.d/mcollective -e 's/\(# chkconfig:\s\+[-0-6]\+\) [0-9]\+ \([0-9]\+\)/\1 81 \2/'
diff --git a/resources/not_provisioned_node/templates/cloud-init-templates/boothook_ubuntu.jinja2 b/resources/not_provisioned_node/templates/cloud-init-templates/boothook_ubuntu.jinja2
index e3c7dd91..753ef758 100644
--- a/resources/not_provisioned_node/templates/cloud-init-templates/boothook_ubuntu.jinja2
+++ b/resources/not_provisioned_node/templates/cloud-init-templates/boothook_ubuntu.jinja2
@@ -1,19 +1,6 @@
 #cloud-boothook
 #!/bin/bash
 
-function add_str_to_file_if_not_exists {
-    file=$1
-    str=$2
-    val=$3
-    if ! grep -q "^ *${str}" $file; then
-        echo $val >> $file
-    fi
-}
-
-cloud-init-per instance wipe_sources_list_templates /bin/sh -c 'echo | tee /etc/cloud/templates/sources.list.ubuntu.tmpl'
-
-# configure udev rules
-
 # udev persistent net
 cloud-init-per instance udev_persistent_net1 /etc/init.d/networking stop
 
@@ -66,31 +53,3 @@ cloud-init-per instance conntrack_max_set sysctl -w "net.nf_conntrack_max=104857
 cloud-init-per instance kernel_panic_set sysctl -w "kernel.panic=60"
 
 cloud-init-per instance dhclient /bin/sh -c 'echo "supersede routers 0;" | tee /etc/dhcp/dhclient.conf'
-
-# ntp sync
-# '| tee /dev/null' is needed for returning zero execution code always
-cloud-init-per instance stop_ntp /bin/sh -c 'service ntp stop | tee /dev/null'
-cloud-init-per instance sync_date ntpdate -t 4 -b {{ common.master_ip }}
-cloud-init-per instance sync_hwclock hwclock --systohc
-
-cloud-init-per instance edit_ntp_conf1 sed -i '/^\s*tinker panic/ d' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf2 sed -i '1 i tinker panic 0' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf_mkdir mkdir -p /var/lib/ntp
-cloud-init-per instance edit_ntp_conf3 /bin/sh -c 'echo 0 | tee /var/lib/ntp/drift'
-cloud-init-per instance edit_ntp_conf4 sed -i '/^\s*server/ d' /etc/ntp.conf
-cloud-init-per instance edit_ntp_conf5 /bin/sh -c 'echo "server {{ common.master_ip }} burst iburst" | tee -a /etc/ntp.conf'
-cloud-init-per instance start_ntp service ntp start
-
-cloud-init-per instance removeUseDNS sed -i --follow-symlinks -e '/UseDNS/d' /etc/ssh/sshd_config
-add_str_to_file_if_not_exists /etc/ssh/sshd_config 'UseDNS' 'UseDNS no'
-
-cloud-init-per instance gssapi_disable sed -i -e "/^\s*GSSAPICleanupCredentials yes/d" -e "/^\s*GSSAPIAuthentication yes/d" /etc/ssh/sshd_config
-
-cloud-init-per instance nailgun_agent_0 /bin/sh -c 'echo "rm -f /etc/nailgun-agent/nodiscover" | tee /etc/rc.local'
-cloud-init-per instance nailgun_agent_1 /bin/sh -c 'echo "flock -w 0 -o /var/lock/agent.lock -c \"/opt/nailgun/bin/agent >> /var/log/nailgun-agent.log 2>&1\"" | tee -a /etc/rc.local'
-
-# Copying default bash settings to the root directory
-cloud-init-per instance skel_bash cp -f /etc/skel/.bash* /root/
-
-cloud-init-per instance hiera_puppet mkdir -p /etc/puppet /var/lib/hiera
-cloud-init-per instance touch_puppet touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
diff --git a/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_centos.jinja2 b/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_centos.jinja2
index 717a9cec..a29701b5 100644
--- a/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_centos.jinja2
+++ b/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_centos.jinja2
@@ -23,82 +23,4 @@ timezone: {{ common.timezone }}
 hostname: {{ common.hostname }}
 fqdn: {{ common.fqdn }}
 
-# add entries to rsyslog configuration
-rsyslog:
-  - filename: 10-log2master.conf
-    content: |
-      $template LogToMaster, "<%%PRI%>1 %$NOW%T%TIMESTAMP:8:$%Z %HOSTNAME% %APP-NAME% %PROCID% %MSGID% -%msg%\n"
-      *.* @{{ common.master_ip }};LogToMaster
-
-runcmd:
-{% if puppet.enable != 1 %}
- - service puppet stop
- - chkconfig puppet off
-{% endif %}
-{% if mcollective.enable != 1 %}
- - service mcollective stop
- - chkconfig mcollective off
-{% else %}
- - chkconfig mcollective on
- - service mcollective restart
-{% endif %}
- - iptables -t filter -F INPUT
- - iptables -t filter -F FORWARD
- - service iptables save
-
-# that module's missing in 0.6.3, but existent for >= 0.7.3
-write_files:
- -   content: |
-        ---
-        url: {{ common.master_url }}
-     path: /etc/nailgun-agent/config.yaml
- -   content: target
-     path: /etc/nailgun_systemtype
-
-mcollective:
-  conf:
-    main_collective: mcollective
-    collectives: mcollective
-    libdir: /usr/libexec/mcollective
-    logfile: /var/log/mcollective.log
-    loglevel: debug
-    daemonize: 1
-    direct_addressing: 1
-    ttl: 4294957
-    securityprovider: psk
-    plugin.psk: {{ mcollective.pskey }}
-{% if mcollective.connector == 'stomp' %}
-    connector = stomp
-    plugin.stomp.host: {{ mcollective.host }}
-    plugin.stomp.port: {{ mcollective.port|default(61613) }}
-    plugin.stomp.user: {{ mcollective.user }}
-    plugin.stomp.password: {{ mcollective.password }}
-{% else %}
-    connector: rabbitmq
-    plugin.rabbitmq.vhost: {{ mcollective.vhost }}
-    plugin.rabbitmq.pool.size: 1
-    plugin.rabbitmq.pool.1.host: {{ mcollective.host }}
-    plugin.rabbitmq.pool.1.port: {{ mcollective.port|default(61613) }}
-    plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
-    plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
-    plugin.rabbitmq.heartbeat_interval: 30
-{% endif %}
-    factsource: yaml
-    plugin.yaml: /etc/mcollective/facts.yaml
-
-puppet:
-  conf:
-    main:
-      logdir: /var/log/puppet
-      rundir: /var/run/puppet
-      ssldir: $vardir/ssl
-      pluginsync: true
-    agent:
-      classfile: $vardir/classes.txt
-      localconfig: $vardir/localconfig
-      server: {{ puppet.master }}
-      report: false
-      configtimeout: 600
-
-
 final_message: "YAY! The system is finally up, after $UPTIME seconds"
diff --git a/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_ubuntu.jinja2 b/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_ubuntu.jinja2
index 61e67583..94e119fe 100644
--- a/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_ubuntu.jinja2
+++ b/resources/not_provisioned_node/templates/cloud-init-templates/cloud_config_ubuntu.jinja2
@@ -22,82 +22,4 @@ timezone: {{ common.timezone }}
 hostname: {{ common.hostname }}
 fqdn: {{ common.fqdn }}
 
-
-# add entries to rsyslog configuration
-rsyslog:
-  - filename: 10-log2master.conf
-    content: |
-      $template LogToMaster, "<%%PRI%>1 %$NOW%T%TIMESTAMP:8:$%Z %HOSTNAME% %APP-NAME% %PROCID% %MSGID% -%msg%\n"
-      *.* @{{ common.master_ip }};LogToMaster
-
-
-# that module's missing in 0.6.3, but existent for >= 0.7.3
-write_files:
- -   content: |
-        ---
-        url: {{ common.master_url }}
-     path: /etc/nailgun-agent/config.yaml
- -   content: target
-     path: /etc/nailgun_systemtype
-
-mcollective:
-  conf:
-    main_collective: mcollective
-    collectives: mcollective
-    libdir: /usr/share/mcollective/plugins
-    logfile: /var/log/mcollective.log
-    loglevel: debug
-    daemonize: 0
-    direct_addressing: 1
-    ttl: 4294957
-    securityprovider: psk
-    plugin.psk: {{ mcollective.pskey }}
-{% if mcollective.connector == 'stomp' %}
-    connector = stomp
-    plugin.stomp.host: {{ mcollective.host }}
-    plugin.stomp.port: {{ mcollective.port|default(61613) }}
-    plugin.stomp.user: {{ mcollective.user }}
-    plugin.stomp.password: {{ mcollective.password }}
-{% else %}
-    connector: rabbitmq
-    plugin.rabbitmq.vhost: {{ mcollective.vhost }}
-    plugin.rabbitmq.pool.size: 1
-    plugin.rabbitmq.pool.1.host: {{ mcollective.host }}
-    plugin.rabbitmq.pool.1.port: {{ mcollective.port|default(61613) }}
-    plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
-    plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
-    plugin.rabbitmq.heartbeat_interval: 30
-{% endif %}
-    factsource: yaml
-    plugin.yaml: /etc/mcollective/facts.yaml
-
-puppet:
-  conf:
-    main:
-      logdir: /var/log/puppet
-      rundir: /var/run/puppet
-      ssldir: $vardir/ssl
-      pluginsync: true
-    agent:
-      classfile: $vardir/classes.txt
-      localconfig: $vardir/localconfig
-      server: {{ puppet.master }}
-      report: false
-      configtimeout: 600
-
-runcmd:
-{% if puppet.enable != 1 %}
- - /usr/sbin/invoke-rc.d puppet stop
- - /usr/sbin/update-rc.d -f puppet remove
-{% endif %}
-{% if mcollective.enable != 1 %}
- - /usr/sbin/invoke-rc.d mcollective stop
- - echo manual > /etc/init/mcollective.override
-{% else %}
- - rm -f /etc/init/mcollective.override
- - service mcollective restart
-{% endif %}
- - iptables -t filter -F INPUT
- - iptables -t filter -F FORWARD
-
 final_message: "YAY! The system is finally up, after $UPTIME seconds"