diff --git a/pillars/servers/env/init.sls b/pillars/servers/env/init.sls
deleted file mode 100644
index 61f1599..0000000
--- a/pillars/servers/env/init.sls
+++ /dev/null
@@ -1,2 +0,0 @@
-include:
-  - servers.env.server.{{ grains['host'] }}
\ No newline at end of file
diff --git a/pillars/servers/env/server/archtest.sls b/pillars/servers/env/server/archtest.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/archtest.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/arr.sls b/pillars/servers/env/server/arr.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/arr.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/atheos.sls b/pillars/servers/env/server/atheos.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/atheos.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/authelia.sls b/pillars/servers/env/server/authelia.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/authelia.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/baikal.sls b/pillars/servers/env/server/baikal.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/baikal.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/base b/pillars/servers/env/server/base
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/base
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/bbs.sls b/pillars/servers/env/server/bbs.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/bbs.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/ca.sls b/pillars/servers/env/server/ca.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/ca.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/clark.sls b/pillars/servers/env/server/clark.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/clark.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/cloud.sls b/pillars/servers/env/server/cloud.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/cloud.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/emby.sls b/pillars/servers/env/server/emby.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/emby.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/git.sls b/pillars/servers/env/server/git.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/git.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/gitea.sls b/pillars/servers/env/server/gitea.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/gitea.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/host.sls b/pillars/servers/env/server/host.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/host.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/host2.sls b/pillars/servers/env/server/host2.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/host2.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/icinga.sls b/pillars/servers/env/server/icinga.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/icinga.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/ipa.sls b/pillars/servers/env/server/ipa.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/ipa.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/jackett.sls b/pillars/servers/env/server/jackett.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/jackett.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/lara.sls b/pillars/servers/env/server/lara.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/lara.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/lidarr.sls b/pillars/servers/env/server/lidarr.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/lidarr.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/ombi.sls b/pillars/servers/env/server/ombi.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/ombi.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/pass.sls b/pillars/servers/env/server/pass.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/pass.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/pkg.sls b/pillars/servers/env/server/pkg.sls
deleted file mode 100644
index b8500d2..0000000
--- a/pillars/servers/env/server/pkg.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: dev
diff --git a/pillars/servers/env/server/portal.sls b/pillars/servers/env/server/portal.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/portal.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/project.sls b/pillars/servers/env/server/project.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/project.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/radarr.sls b/pillars/servers/env/server/radarr.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/radarr.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/router.sls b/pillars/servers/env/server/router.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/router.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/rtorrent.sls b/pillars/servers/env/server/rtorrent.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/rtorrent.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/salt.sls b/pillars/servers/env/server/salt.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/salt.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/sonarr.sls b/pillars/servers/env/server/sonarr.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/sonarr.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/sql.sls b/pillars/servers/env/server/sql.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/sql.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/ssh.sls b/pillars/servers/env/server/ssh.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/ssh.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/sync.sls b/pillars/servers/env/server/sync.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/sync.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/transmission.sls b/pillars/servers/env/server/transmission.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/transmission.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/tt.sls b/pillars/servers/env/server/tt.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/tt.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/video.sls b/pillars/servers/env/server/video.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/video.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/env/server/vpn.sls b/pillars/servers/env/server/vpn.sls
deleted file mode 100644
index 2fdef9a..0000000
--- a/pillars/servers/env/server/vpn.sls
+++ /dev/null
@@ -1 +0,0 @@
-env: prod
diff --git a/pillars/servers/mkserver.sh b/pillars/servers/mkserver.sh
index b8cc7d2..d576533 100644
--- a/pillars/servers/mkserver.sh
+++ b/pillars/servers/mkserver.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
-cp env/server/base env/server/$1.sls
 cp roles/server/base roles/server/$1.sls
 
diff --git a/states/roles/maintain/saltminion/minion b/states/roles/maintain/saltminion/minion
index e619a21..63f061b 100644
--- a/states/roles/maintain/saltminion/minion
+++ b/states/roles/maintain/saltminion/minion
@@ -347,12 +347,8 @@ master: salt.actcur.com
 # when running states, but the environment can be isolated on the minion side
 # by statically setting it. Remember that the recommended way to manage
 # environments is to isolate via the top file.
-{%- set env="dev" -%}
-{%- if pillar['env'] is defined -%}
-  {%- set env=pillar['env'] -%}
-{%- endif %}
-saltenv: {{ env }}
-pillarenv: {{ env }}
+saltenv: {{ saltenv }}
+pillarenv: {{ saltenv }}
 #
 # If using the local file directory, then the state top file name needs to be
 # defined, by default this is top.sls.