diff --git a/.puppet/manifests/default.pp b/.puppet/manifests/default.pp
deleted file mode 100644
index 80abad8ef..000000000
--- a/.puppet/manifests/default.pp
+++ /dev/null
@@ -1,2 +0,0 @@
-include icinga2_dev
-include icingaweb2_dev
diff --git a/.puppet/manifests/default.pp.old b/.puppet/manifests/default.pp.old
deleted file mode 100644
index f2516f6d0..000000000
--- a/.puppet/manifests/default.pp.old
+++ /dev/null
@@ -1,375 +0,0 @@
-include apache
-include mysql
-include pgsql
-include openldap
-
-include icingaweb2
-include nodejs
-include icinga2_dev
-
-Exec { path => '/bin:/usr/bin:/sbin:/usr/sbin' }
-
-$icingaVersion = '1.11.5'
-$icinga2Version = '2.0.1'
-$livestatusVersion = '1.2.4p5'
-$phantomjsVersion = '1.9.1'
-$casperjsVersion = '1.0.2'
-
-class { [
-  'icinga_mysql',
-  'icinga_pgsql' ]:
-  icingaVersion => $icingaVersion,
-}
-
-package { [
-  'gcc', 'glibc', 'glibc-common', 'gd', 'gd-devel',
-  'libpng', 'libpng-devel', 'net-snmp', 'net-snmp-devel', 'net-snmp-utils',
-  'libdbi', 'libdbi-devel', 'libdbi-drivers',
-  'libdbi-dbd-mysql', 'libdbi-dbd-pgsql' ]:
-  ensure => installed
-}
-
-php::extension { ['php-mysql', 'php-pgsql', 'php-ldap']:
-  require => [ Class['mysql'], Class['pgsql'], Class['openldap'] ]
-}
-
-php::extension { 'php-gd': }
-
-group { 'icinga-cmd':
-  ensure => present
-}
-
-group { 'icingacmd':
-  ensure  => present,
-  require => Package['icinga2']
-}
-
-user { 'icinga':
-  ensure     => present,
-  groups     => 'icinga-cmd',
-  managehome => false
-}
-
-user { 'apache':
-  groups  => ['icinga-cmd', 'vagrant', 'icingacmd'],
-  require => [ Class['apache'], Group['icinga-cmd'], Group['icingacmd'] ]
-}
-
-exec { 'iptables-allow-http':
-  unless  => 'grep -Fxqe "-A INPUT -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT" /etc/sysconfig/iptables',
-  command => 'iptables -I INPUT 5 -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT && iptables-save > /etc/sysconfig/iptables'
-}
-
-exec { 'icinga-htpasswd':
-  creates => '/usr/share/icinga/htpasswd.users',
-  command => 'mkdir -p /usr/share/icinga && htpasswd -b -c /usr/share/icinga/htpasswd.users icingaadmin icinga',
-  require => Class['apache']
-}
-
-cmmi { 'mk-livestatus':
-  url     => "http://mathias-kettner.de/download/mk-livestatus-${livestatusVersion}.tar.gz",
-  output  => "mk-livestatus-${livestatusVersion}.tar.gz",
-  flags   => '--prefix=/usr/local/icinga-mysql --exec-prefix=/usr/local/icinga-mysql',
-  creates => '/usr/local/icinga-mysql/lib/mk-livestatus',
-  make    => 'make && make install',
-  require => Cmmi['icinga-mysql']
-}
-
-file { '/usr/local/icinga-mysql/etc/modules/mk-livestatus.cfg':
-  content => template('mk-livestatus/mk-livestatus.cfg.erb'),
-  owner   => 'icinga',
-  group   => 'icinga',
-  require => Cmmi['mk-livestatus'],
-  notify  => [ Service['icinga-mysql'], Service['ido2db-mysql'] ]
-}
-
-file { 'openldap/db.ldif':
-  path    => '/usr/share/openldap-servers/db.ldif',
-  source  => 'puppet:///modules/openldap/db.ldif',
-  require => Class['openldap']
-}
-
-file { 'openldap/dit.ldif':
-  path    => '/usr/share/openldap-servers/dit.ldif',
-  source  => 'puppet:///modules/openldap/dit.ldif',
-  require => Class['openldap']
-}
-
-file { 'openldap/users.ldif':
-  path    => '/usr/share/openldap-servers/users.ldif',
-  source  => 'puppet:///modules/openldap/users.ldif',
-  require => Class['openldap']
-}
-
-exec { 'populate-openldap':
-  # TODO: Split the command and use unless instead of trying to populate openldap everytime
-  command => 'sudo ldapadd -c -Y EXTERNAL -H ldapi:/// -f /usr/share/openldap-servers/db.ldif || true && \
-              sudo ldapadd -c -D cn=admin,dc=icinga,dc=org -x -w admin -f /usr/share/openldap-servers/dit.ldif || true && \
-              sudo ldapadd -c -D cn=admin,dc=icinga,dc=org -x -w admin -f /usr/share/openldap-servers/users.ldif || true',
-  require => [ Service['slapd'], File['openldap/db.ldif'],
-               File['openldap/dit.ldif'], File['openldap/users.ldif'] ]
-}
-
-class { 'phantomjs':
-  url     => "https://phantomjs.googlecode.com/files/phantomjs-${phantomjsVersion}-linux-x86_64.tar.bz2",
-  output  => "phantomjs-${phantomjsVersion}-linux-x86_64.tar.bz2",
-  creates => '/usr/local/phantomjs'
-}
-
-class { 'casperjs':
-  url     => "https://github.com/n1k0/casperjs/tarball/${casperjsVersion}",
-  output  => "casperjs-${casperjsVersion}.tar.gz",
-  creates => '/usr/local/casperjs'
-}
-
-file { '/etc/profile.d/env.sh':
-  source => 'puppet:////vagrant/.vagrant-puppet/files/etc/profile.d/env.sh'
-}
-
-include epel
-
-exec { 'install PHPUnit':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-phpunit-PHPUnit',
-  unless  => 'rpm -qa | grep php-phpunit-PHPUnit',
-  require => Class['epel']
-}
-
-exec { 'install PHP CodeSniffer':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-pear-PHP-CodeSniffer',
-  unless  => 'rpm -qa | grep php-pear-PHP-CodeSniffer',
-  require => Class['epel']
-}
-
-exec { 'install php-ZendFramework':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-ZendFramework',
-  unless  => 'rpm -qa | grep php-ZendFramework',
-  require => Class['epel']
-}
-
-package { ['cmake', 'boost-devel', 'bison', 'flex']:
-  ensure => installed
-}
-
-# icinga 2
-yumrepo { 'icinga2-repo':
-  baseurl   => "http://packages.icinga.org/epel/6/snapshot/",
-  enabled   => '1',
-  gpgcheck  => '1',
-  gpgkey    => 'http://packages.icinga.org/icinga.key',
-  descr     => "Icinga Repository - ${::architecture}"
-}
-
-exec { 'install nagios-plugins-all':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install nagios-plugins-all',
-  unless  => 'rpm -qa | grep nagios-plugins-all',
-  require => [ Class['epel'], Package['icinga2'] ],
-}
-# vs include monitoring_plugins (epel is disabled)
-
-
-# icinga 2 classic ui
-package { 'icinga-gui':
-  ensure => latest,
-  require => Yumrepo['icinga2-repo'],
-  alias => 'icinga-gui'
-}
-
-# icinga 2 ido mysql
-
-
-# icinga 2 test config
-
-
-exec { 'install php-ZendFramework-Db-Adapter-Pdo-Mysql':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-ZendFramework-Db-Adapter-Pdo-Mysql',
-  unless  => 'rpm -qa | grep php-ZendFramework-Db-Adapter-Pdo-Mysql',
-  require => Exec['install php-ZendFramework']
-}
-
-file { '/etc/motd':
-  source => 'puppet:////vagrant/.vagrant-puppet/files/etc/motd',
-  owner  => root,
-  group  => root
-}
-
-user { 'vagrant':
-  groups  => 'icinga-cmd',
-  require => Group['icinga-cmd']
-}
-
-mysql::database::create { 'icinga_unittest':
-  username => 'icinga_unittest',
-  password => 'icinga_unittest',
-  privileges => 'ALL',
-}
-
-pgsql::database::create { 'icinga_unittest':
-  username => 'icinga_unittest',
-  password => 'icinga_unittest',
-}
-
-exec { 'install php-ZendFramework-Db-Adapter-Pdo-Pgsql':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install php-ZendFramework-Db-Adapter-Pdo-Pgsql',
-  unless  => 'rpm -qa | grep php-ZendFramework-Db-Adapter-Pdo-Pgsql',
-  require => Exec['install php-ZendFramework']
-}
-
-
-#
-# Following section installs the Perl module Monitoring::Generator::TestConfig in order to create test config to
-# */usr/local/share/misc/monitoring_test_config*. Then the config is copied to *<instance>/etc/conf.d/test_config/* of
-# both the MySQL and PostgreSQL Icinga instance
-#
-cpan { 'Monitoring::Generator::TestConfig':
-  creates => '/usr/local/share/perl5/Monitoring/Generator/TestConfig.pm',
-  timeout => 600
-}
-
-exec { 'create_monitoring_test_config':
-  command => 'sudo install -o root -g root -d /usr/local/share/misc/ && \
-              sudo /usr/local/bin/create_monitoring_test_config.pl -l icinga \
-              /usr/local/share/misc/monitoring_test_config',
-  creates => '/usr/local/share/misc/monitoring_test_config',
-  require => Cpan['Monitoring::Generator::TestConfig']
-}
-
-define populate_monitoring_test_config {
-  file { "/usr/local/icinga-mysql/etc/conf.d/test_config/${name}.cfg":
-    owner   => 'icinga',
-    group   => 'icinga',
-    source  => "/usr/local/share/misc/monitoring_test_config/etc/conf.d/${name}.cfg",
-    notify  => Service['icinga-mysql']
-  }
-  file { "/usr/local/icinga-pgsql/etc/conf.d/test_config/${name}.cfg":
-    owner   => 'icinga',
-    group   => 'icinga',
-    source  => "/usr/local/share/misc/monitoring_test_config/etc/conf.d/${name}.cfg",
-    notify  => Service['icinga-pgsql']
-  }
-}
-
-file { '/usr/local/icinga-mysql/etc/conf.d/test_config/':
-  ensure  => directory,
-  owner   => icinga,
-  group   => icinga,
-  require => Cmmi['icinga-mysql']
-}
-
-file { '/usr/local/icinga-pgsql/etc/conf.d/test_config/':
-  ensure  => directory,
-  owner   => icinga,
-  group   => icinga,
-  require => Cmmi['icinga-pgsql']
-}
-
-populate_monitoring_test_config { ['commands', 'contacts', 'dependencies',
-                                   'hostgroups', 'hosts', 'servicegroups', 'services']:
-  require   => [ Exec['create_monitoring_test_config'],
-                 File['/usr/local/icinga-mysql/etc/conf.d/test_config/'],
-                 File['/usr/local/icinga-pgsql/etc/conf.d/test_config/'] ]
-}
-
-define populate_monitoring_test_config_plugins {
-  file { "/usr/lib64/nagios/plugins/libexec/${name}":
-    owner   => 'icinga',
-    group   => 'icinga',
-    source  => "/usr/local/share/misc/monitoring_test_config/plugins/${name}",
-    notify  => [ Service['icinga-mysql'], Service['icinga-pgsql'] ]
-  }
-}
-
-populate_monitoring_test_config_plugins{ ['test_hostcheck.pl', 'test_servicecheck.pl']:
-  require   => [ Exec['create_monitoring_test_config'],
-                 Cmmi['icinga-mysql'],
-                 Cmmi['icinga-pgsql'] ]
-}
-
-#
-# Following section creates and populates MySQL and PostgreSQL Icinga Web 2 databases
-#
-
-
-#
-# Following section creates the Icinga command proxy to /usr/local/icinga-mysql/var/rw/icinga.cmd (which is the
-# config's default path for the Icinga command pipe) in order to send commands to both the MySQL and PostgreSQL instance
-#
-file { [ '/usr/local/icinga/', '/usr/local/icinga/var/', '/usr/local/icinga/var/rw/' ]:
-  ensure  => directory,
-  owner   => icinga,
-  group   => icinga,
-  require => User['icinga']
-}
-
-file { '/usr/local/bin/icinga_command_proxy':
-  source => 'puppet:////vagrant/.vagrant-puppet/files/usr/local/bin/icinga_command_proxy',
-  owner  => root,
-  group  => root,
-  mode   => 755
-}
-
-file { '/etc/init.d/icinga_command_proxy':
-  source  => 'puppet:////vagrant/.vagrant-puppet/files/etc/init.d/icinga_command_proxy',
-  owner   => root,
-  group   => root,
-  mode    => 755,
-  require => File['/usr/local/bin/icinga_command_proxy']
-}
-
-service { 'icinga_command_proxy':
-  ensure  => running,
-  require => [ File['/etc/init.d/icinga_command_proxy'], Service['icinga-mysql'], Service['icinga-pgsql'] ]
-}
-
-mysql::database::create { 'icinga_web':
-  username => 'icinga_web',
-  password => 'icinga_web',
-  privileges => 'ALL',
-}
-
-cmmi { 'icinga-web':
-  url     => 'http://sourceforge.net/projects/icinga/files/icinga-web/1.10.0-beta/icinga-web-1.10.0-beta.tar.gz/download',
-  output  => 'icinga-web-1.10.0-beta.tar.gz',
-  flags   => '--prefix=/usr/local/icinga-web',
-  creates => '/usr/local/icinga-web',
-  make    => 'make install && make install-apache-config',
-  require => Service['icinga_command_proxy'],
-  notify  => Service['apache']
-}
-
-exec { 'populate-icinga_web-mysql-db':
-  unless  => 'mysql -uicinga_web -picinga_web icinga_web -e "SELECT * FROM nsm_user;" &> /dev/null',
-  command => 'mysql -uicinga_web -picinga_web icinga_web < /usr/local/src/icinga-web/icinga-web-1.10.0-beta/etc/schema/mysql.sql',
-  require => [ Exec['create-mysql-icinga_web-db'], Cmmi['icinga-web'] ]
-}
-
-file { '/var/www/html/icingaweb':
-  ensure => absent,
-}
-
-# pear::package { 'deepend/Mockery':
-#  channel => 'pear.survivethedeepend.com'
-# }
-
-# icingacli
-file { '/usr/local/bin/icingacli':
-  ensure  => 'link',
-  target  => '/vagrant/bin/icingacli',
-  owner   => 'apache',
-  group   => 'apache',
-  require => [ File['/etc/icingaweb'], File['/etc/bash_completion.d/icingacli'] ]
-}
-
-exec { 'install bash-completion':
-  command => 'yum -d 0 -e 0 -y --enablerepo=epel install bash-completion',
-  unless  => 'rpm -qa | grep bash-completion',
-  require => Class['epel']
-}
-
-file { '/etc/bash_completion.d/icingacli':
-   source    => 'puppet:////vagrant/etc/bash_completion.d/icingacli',
-   owner     => 'root',
-   group     => 'root',
-   mode      => 755,
-   require   => Exec['install bash-completion']
-}
-
diff --git a/.puppet/manifests/finalize.sh b/.puppet/manifests/finalize.sh
deleted file mode 100644
index 069bb7734..000000000
--- a/.puppet/manifests/finalize.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mountIcinga2webVarLog () {
-    if ! $(/bin/mount | /bin/grep -q "/vagrant/var/log"); then
-        # Remount /vagrant/var/log/ with appropriate permissions since the group apache is missing initially
-        /bin/mount -t vboxsf -o \
-            uid=`id -u vagrant`,gid=`id -g apache`,dmode=775,fmode=664 \
-            /vagrant/var/log/ \
-            /vagrant/var/log/
-    fi
-}
-
-mountIcinga2webVarLog
-
-exit 0