diff --git a/profiles/CDS/amd64/20/calculate.env b/profiles/CDS/amd64/20/calculate.env
deleted file mode 100644
index 74f5c75..0000000
--- a/profiles/CDS/amd64/20/calculate.env
+++ /dev/null
@@ -1,3 +0,0 @@
-[main]
-cl_template_location = calculate,distros,local,remote
-cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
diff --git a/profiles/CSS/amd64/20/calculate.env b/profiles/CSS/amd64/20/calculate.env
deleted file mode 100644
index 74f5c75..0000000
--- a/profiles/CSS/amd64/20/calculate.env
+++ /dev/null
@@ -1,3 +0,0 @@
-[main]
-cl_template_location = calculate,distros,local,remote
-cl_template_path = /var/db/repos/calculate/profiles/templates,/var/db/repos/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
diff --git a/profiles/calculate.env b/profiles/calculate.env
index 64b1d10..e63abab 100644
--- a/profiles/calculate.env
+++ b/profiles/calculate.env
@@ -1,6 +1,6 @@
 [main]
-cl_template_location = calculate,distros,local,remote
-cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/profiles/templates,/var/calculate/templates,/var/calculate/remote/templates
+cl_template_location = calculate,distros,local
+cl_template_path = /var/lib/layman/calculate/profiles/templates,/var/lib/layman/distros/profiles/templates,/var/calculate/templates
 
 [update]
 cl_update_rep_name = gentoo,calculate,distros