diff --git a/kit.yml b/kit.yml
index 507c7af..227833e 100644
--- a/kit.yml
+++ b/kit.yml
@@ -4,11 +4,6 @@ author: Geoff Franks <geoff.franks@gmail.com>
 homepage: https://github.com/cloudfoundry-incubator/nfs-volume-release
 github: https://github.com/genesis-community/nfs-genesis-kit
 
-subkits:
-  - prompt: "Do you need to deploy an NFS server along side the NFS Broker?"
-    subkit: nfs-server
-    default: no
-
 params:
   base:
   - param: vm_type
@@ -35,11 +30,6 @@ params:
   - param: skip_ssl_validation
     description: |
       Ignores SSL certificates when connecting to Cloud Foundry to register the NFS broker
-  nfs-server:
-  - param: allowed_hosts
-    description: List of CIDR ranges to allow NFS exports from
-    ask: What CIDR ranges should be allowed to access the NFS server?
-    type: list
 
 credentials:
   base:
diff --git a/subkits/nfs-server/params.yml b/subkits/nfs-server/params.yml
deleted file mode 100644
index fce1211..0000000
--- a/subkits/nfs-server/params.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-params:
-  no_root_squash: false
-  allowed_hosts: (( param "What hosts should be allowed to talk to NFS?" ))
diff --git a/subkits/nfs-server/server.yml b/subkits/nfs-server/server.yml
deleted file mode 100644
index 5220b72..0000000
--- a/subkits/nfs-server/server.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-instance_groups:
-- name: nfsbroker
-  jobs:
-    - name: nfstestserver
-      release: nfs-volume
-      properties:
-        export_cidr: (( grab params.allowed_hosts ))
-
-releases:
-- name: nfs
-  url: https://bosh.io/d/github.com/compozed/nfs-boshrelease?v=0.1
-  sha1: 983fb960c13a6ed77ead8fa0332d2b882e384dd4
-  version: 0.1