diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml
index 978acfc..6168748 100644
--- a/roles/nginx/tasks/main.yml
+++ b/roles/nginx/tasks/main.yml
@@ -27,11 +27,6 @@
 
 - name: Create fastcgi cache dir
   file: path=/var/cache/nginx/cached/fastcgi state=directory owner=nginx group=nginx mode=0755
-  tags: nginx
-
-- include: vhosts.yml
-  when: nginx_vhosts is defined
-  tags: nginx
 
 - include: tls_vhosts.yml
   when: nginx_tls_vhosts is defined
diff --git a/roles/nginx/tasks/vhosts.yml b/roles/nginx/tasks/vhosts.yml
deleted file mode 100644
index dbd2e2a..0000000
--- a/roles/nginx/tasks/vhosts.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-- name: Configure http vhosts
-  template: src=vhost.conf.j2 dest={{ nginx_confd_path }}/{{ item.nginx_domain_name }}.conf mode=0644 owner=root group=root
-  with_items: nginx_vhosts
-  notify:
-    - reload nginx
-
-- name: Create vhost document roots
-  file: path={{ nginx_root_prefix }}/{{ item.nginx_domain_name }} state=directory mode=0755 owner=nginx group=nginx
-  with_items: nginx_vhosts
-
-- name: Install WordPress
-  git: repo=https://github.com/WordPress/WordPress.git dest={{ nginx_root_prefix }}/{{ item.nginx_domain_name }}/wordpress version={{ item.wordpress_version }} depth=1
-  when: item.has_wordpress == 'yes'
-  with_items: nginx_vhosts
-  tags: wordpress
-
-# vim: set ts=2 sw=2:
diff --git a/roles/php5-fpm/tasks/main.yml b/roles/php5-fpm/tasks/main.yml
index 64e0bf4..e753458 100644
--- a/roles/php5-fpm/tasks/main.yml
+++ b/roles/php5-fpm/tasks/main.yml
@@ -9,13 +9,6 @@
     - php5-curl
   tags: php5-fpm
 
-- name: Copy php5-fpm pool config
-  template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
-  with_items: nginx_vhosts
-  when: nginx_vhosts is defined
-  notify: restart php5-fpm
-  tags: php5-fpm
-
 - name: Copy php5-fpm pool config
   template: src=pool.conf.j2 dest=/etc/php5/fpm/pool.d/{{ item.nginx_domain_name }}.conf owner=root group=root mode=0644
   with_items: nginx_tls_vhosts