diff --git a/metadata/service/cluster/single.yml b/metadata/service/cluster/single.yml
index 947b5f2..1a22d4a 100644
--- a/metadata/service/cluster/single.yml
+++ b/metadata/service/cluster/single.yml
@@ -5,8 +5,4 @@
 parameters:
   maas:
     cluster:
-      enabled: true
-      version: '2'
-      region: 
-        host: localhost
-        port: 5240
+      enabled: true
\ No newline at end of file
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
deleted file mode 100644
index 8194035..0000000
--- a/metadata/service/server/cluster.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-\applications:
-- maas
-classes:
-- service.maas.support
-parameters:
-  maas:
-    server:
-      enabled: true
-      bind:
-        address: 0.0.0.0
-    
\ No newline at end of file
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
deleted file mode 100644
index e231e4d..0000000
--- a/metadata/service/server/single.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-applications:
-- maas
-classes:
-- service.maas.support
-parameters:
-  maas:
-    server:
-      enabled: true
-      bind:
-        address: 0.0.0.0
diff --git a/metadata/service/server/vendor_repo.yml b/metadata/service/server/vendor_repo.yml
deleted file mode 100644
index bf37918..0000000
--- a/metadata/service/server/vendor_repo.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-parameters:
-  linux:
-    system:
-      repo:
-        maas:
-          source: deb http://ppa.launchpad.net/maas/stable/ubuntu xenial main
-          key_url: salt://maas/files/vendor_key.gpg