diff --git a/hosts b/hosts
index 1d83088..7622ec8 100644
--- a/hosts
+++ b/hosts
@@ -3,11 +3,11 @@ ansible_connection=local
 ansible_python_interpreter=/usr/bin/python3
 
 [common]
-thunix.net
+localhost
 
 [shell]
-thunix.net
+localhost
 
 [webserver]
-thunix.net
+localhost
 
diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml
index 96d1f97..e174086 100644
--- a/roles/shell/tasks/packages.yml
+++ b/roles/shell/tasks/packages.yml
@@ -83,7 +83,7 @@
       - cowsay
       - devscripts
       - dos2unix
-      - dosemu
+#      - dosemu
       - dovecot-pop3d
       - dovecot-core
       - dovecot-imapd
@@ -101,7 +101,7 @@
       - gitweb
       - gopher
       - gnome-icon-theme
-      - gnome-icon-theme-extras
+#      - gnome-icon-theme-extras
       - htop
       - hugo
       - ident2
@@ -142,13 +142,13 @@
       - mc-data
       - midori
       - minetest-data
-      - minetest-mod-advspawning
-      - minetest-mod-animalmaterials
-      - minetest-mod-animals
+#      - minetest-mod-advspawning
+#      - minetest-mod-animalmaterials
+#      - minetest-mod-animals
       - minetest-mod-maidroid
       - minetest-mod-mesecons
-      - minetest-mod-mobf-core
-      - minetest-mod-mobf-trap
+#      - minetest-mod-mobf-core
+#      - minetest-mod-mobf-trap
       - minetest-mod-moreblocks
       - minetest-mod-moreores
       - minetest-mod-nether
@@ -158,7 +158,7 @@
       - mkdocs
       - mkdocs-doc
       - mkdocs-bootstrap
-      - mkdocs-bootswatch
+#      - mkdocs-bootswatch
       - mono-apache-server
       - mono-complete
       - mono-dbg
@@ -167,9 +167,9 @@
       - moon-buggy
       - mosh
       - mutt
-      - mysql-client
+#      - mysql-client
       - nasm
-      - nbsdgames
+#      - nbsdgames
       - neofetch
       - neomutt
       - newsbeuter
@@ -205,7 +205,7 @@
       - python-certbot-apache
       - python-flask
       - python-pip
-      - python-potr
+#      - python-potr
       - python-twisted
       - python3
       - python3-flask
diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml
index b9ddfd1..c62eb1b 100644
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@@ -8,11 +8,6 @@
     mode: 744
 
 #Sites
-- name: Deploy Apache2 Site Config 000-default.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/000-default.conf
-    dest: /etc/apache2/sites-available/000-default.conf
-
 - name: Deploy Apache2 Site Config default-ssl.conf
   copy:
     src: ../files/etc/apache2/sites-available/default-ssl.conf
@@ -48,21 +43,6 @@
     src: ../files/etc/apache2/sites-available/ftp.thunix.net.conf
     dest: /etc/apache2/sites-available/ftp.thunix.net.conf
 
-- name: Deploy apache2 site conf for forums.thunix.net.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/forums.thunix.net.conf
-    dest: /etc/apache2/sites-available/forums.thunix.net.conf
-
-- name: Deploy apache2 site conf for git.thunix.net.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/git.thunix.net.conf
-    dest: /etc/apache2/sites-available/git.thunix.net.conf
-
-- name: Deploy apache2 site conf for lists.thunix.net.conf
-  copy:
-    src: ../files/etc/apache2/sites-available/lists.thunix.net.conf
-    dest: /etc/apache2/sites-available/lists.thunix.net.conf
-
 - name: Deploy apache2 site conf for staticadventures.netlib.re
   copy:
     src: ../files/etc/apache2/sites-available/staticadventures.netlib.re.conf
diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml
index 5d0bc56..4f8c564 100644
--- a/roles/webserver/tasks/main.yml
+++ b/roles/webserver/tasks/main.yml
@@ -3,7 +3,7 @@
 
 - include: packages.yml
   #- include: users.yml
-- include: apache.yml
+#- include: apache.yml
 - include: codedeploy.yml
 - include: apache2-mods.yml
 - include: tor.yml
diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml
index 096e51c..94a915a 100644
--- a/roles/webserver/tasks/packages.yml
+++ b/roles/webserver/tasks/packages.yml
@@ -29,7 +29,7 @@
       - apache2
       - createrepo
       - dpkg-dev
-      - gophernicus
+#      - gophernicus
       - mariadb-client
       - mariadb-server
       - php-imagick