diff --git a/TEMPLATE/defaults.yaml b/TEMPLATE/defaults.yaml
deleted file mode 100644
index a5c495e3..00000000
--- a/TEMPLATE/defaults.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-TEMPLATE:
-  pkg:
-    name: TEMPLATE
-  rootgroup: root
-  config: '/etc/TEMPLATE'
-  service:
-    name: TEMPLATE
-  subcomponent:
-    config: '/etc/TEMPLATE-subcomponent-formula.conf'
-  # Just here for testing
-  added_in_defaults: defaults_value
-  winner: defaults
diff --git a/TEMPLATE/parameters/os/Amazon.yaml b/TEMPLATE/parameters/os/Amazon.yaml
deleted file mode 100644
index 29ae24ad..00000000
--- a/TEMPLATE/parameters/os/Amazon.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == Amazon.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/CentOS.yaml b/TEMPLATE/parameters/os/CentOS.yaml
deleted file mode 100644
index da221cdb..00000000
--- a/TEMPLATE/parameters/os/CentOS.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == CentOS.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/Funtoo.yaml b/TEMPLATE/parameters/os/Funtoo.yaml
deleted file mode 100644
index 7665383e..00000000
--- a/TEMPLATE/parameters/os/Funtoo.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == Funtoo.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/Manjaro.yaml b/TEMPLATE/parameters/os/Manjaro.yaml
deleted file mode 100644
index d99be9f4..00000000
--- a/TEMPLATE/parameters/os/Manjaro.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == Manjaro.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/Raspbian.yaml b/TEMPLATE/parameters/os/Raspbian.yaml
deleted file mode 100644
index 5edbb2df..00000000
--- a/TEMPLATE/parameters/os/Raspbian.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == Raspbian.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/SUSE.yaml b/TEMPLATE/parameters/os/SUSE.yaml
deleted file mode 100644
index 5bc4e8d4..00000000
--- a/TEMPLATE/parameters/os/SUSE.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == SUSE.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/SmartOS.yaml b/TEMPLATE/parameters/os/SmartOS.yaml
deleted file mode 100644
index 5f6e19ce..00000000
--- a/TEMPLATE/parameters/os/SmartOS.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == SmartOS.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os/openSUSE.yaml b/TEMPLATE/parameters/os/openSUSE.yaml
deleted file mode 100644
index ae9e4f99..00000000
--- a/TEMPLATE/parameters/os/openSUSE.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os') == openSUSE.
-# You just need to add the key:values for this `os` that differ
-# from `defaults.yaml` + `<osarch>.yaml` + `<os_family>.yaml`.
-#
-# If you do not need to provide defaults via the `os` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os_family/Alpine.yaml b/TEMPLATE/parameters/os_family/Alpine.yaml
deleted file mode 100644
index cc7ee8e3..00000000
--- a/TEMPLATE/parameters/os_family/Alpine.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os_family') == Alpine.
-# You just need to add the key:values for this `os_family` that differ
-# from `defaults.yaml` + `<osarch>.yaml`.
-#
-# If you do not need to provide defaults via the `os_family` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os_family/Gentoo.yaml b/TEMPLATE/parameters/os_family/Gentoo.yaml
deleted file mode 100644
index d5b82d47..00000000
--- a/TEMPLATE/parameters/os_family/Gentoo.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os_family') == Gentoo.
-# You just need to add the key:values for this `os_family` that differ
-# from `defaults.yaml` + `<osarch>.yaml`.
-#
-# If you do not need to provide defaults via the `os_family` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os_family/MacOS.yaml b/TEMPLATE/parameters/os_family/MacOS.yaml
deleted file mode 100644
index 14028d58..00000000
--- a/TEMPLATE/parameters/os_family/MacOS.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os_family') == MacOS.
-# You just need to add the key:values for this `os_family` that differ
-# from `defaults.yaml` + `<osarch>.yaml`.
-#
-# If you do not need to provide defaults via the `os_family` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os_family/Solaris.yaml b/TEMPLATE/parameters/os_family/Solaris.yaml
deleted file mode 100644
index ee34401d..00000000
--- a/TEMPLATE/parameters/os_family/Solaris.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os_family') == Solaris.
-# You just need to add the key:values for this `os_family` that differ
-# from `defaults.yaml` + `<osarch>.yaml`.
-#
-# If you do not need to provide defaults via the `os_family` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/os_family/Windows.yaml b/TEMPLATE/parameters/os_family/Windows.yaml
deleted file mode 100644
index 30e89c3c..00000000
--- a/TEMPLATE/parameters/os_family/Windows.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('os_family') == Windows.
-# You just need to add the key:values for this `os_family` that differ
-# from `defaults.yaml` + `<osarch>.yaml`.
-#
-# If you do not need to provide defaults via the `os_family` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml b/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml
deleted file mode 100644
index 36db3f1f..00000000
--- a/TEMPLATE/parameters/osfinger/Amazon Linux AMI-2018.yaml	
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Amazon Linux AMI-2018.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml b/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml
deleted file mode 100644
index d01b29d6..00000000
--- a/TEMPLATE/parameters/osfinger/Amazon Linux-2.yaml	
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Amazon Linux-2.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml b/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml
deleted file mode 100644
index 377b5a51..00000000
--- a/TEMPLATE/parameters/osfinger/CentOS Linux-7.yaml	
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == CentOS Linux-7.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml b/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml
deleted file mode 100644
index 3c44f6da..00000000
--- a/TEMPLATE/parameters/osfinger/CentOS Linux-8.yaml	
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == CentOS Linux-8.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Debian-10.yaml b/TEMPLATE/parameters/osfinger/Debian-10.yaml
deleted file mode 100644
index 405fd829..00000000
--- a/TEMPLATE/parameters/osfinger/Debian-10.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Debian-10.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Debian-8.yaml b/TEMPLATE/parameters/osfinger/Debian-8.yaml
deleted file mode 100644
index 1986cf03..00000000
--- a/TEMPLATE/parameters/osfinger/Debian-8.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Debian-8.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Debian-9.yaml b/TEMPLATE/parameters/osfinger/Debian-9.yaml
deleted file mode 100644
index 23763b97..00000000
--- a/TEMPLATE/parameters/osfinger/Debian-9.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Debian-9.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Fedora-30.yaml b/TEMPLATE/parameters/osfinger/Fedora-30.yaml
deleted file mode 100644
index fe087626..00000000
--- a/TEMPLATE/parameters/osfinger/Fedora-30.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Fedora-30.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Fedora-31.yaml b/TEMPLATE/parameters/osfinger/Fedora-31.yaml
deleted file mode 100644
index b814854e..00000000
--- a/TEMPLATE/parameters/osfinger/Fedora-31.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Fedora-31.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml b/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml
deleted file mode 100644
index 542cef9f..00000000
--- a/TEMPLATE/parameters/osfinger/FreeBSD-12.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == FreeBSD-12.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Gentoo-2.yaml b/TEMPLATE/parameters/osfinger/Gentoo-2.yaml
deleted file mode 100644
index b06f4e69..00000000
--- a/TEMPLATE/parameters/osfinger/Gentoo-2.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Gentoo-2.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Leap-15.yaml b/TEMPLATE/parameters/osfinger/Leap-15.yaml
deleted file mode 100644
index 9a07b706..00000000
--- a/TEMPLATE/parameters/osfinger/Leap-15.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Leap-15.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml b/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml
deleted file mode 100644
index 9713a80e..00000000
--- a/TEMPLATE/parameters/osfinger/Ubuntu-16.04.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Ubuntu-16.04.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...
diff --git a/TEMPLATE/parameters/osfinger/Windows-8.1.yaml b/TEMPLATE/parameters/osfinger/Windows-8.1.yaml
deleted file mode 100644
index 536edb5f..00000000
--- a/TEMPLATE/parameters/osfinger/Windows-8.1.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
-#
-# Setup variables specific to salt['config.get']('osfinger') == Windows-8.1.
-# You just need to add the key:values for this `osfinger` that differ
-# from `defaults.yaml`.
-#
-# If you do not need to provide defaults via the `osfinger` config,
-# you can remove this file or provide at least an empty dict, e.g.
-# values: {}
-#
-# This file will be merged with `salt.slsutil.merge`:
-#
-# You can select the merging strategy by defining the `strategy` dict
-# with one of: `aggregate`, `list`, `overwrite`, `recurse`, `smart`, e.g.
-# strategy: 'recurse'
-#
-# If you use the `recurse` or `overwrite` strategy, you can aggregate
-# the lists by defining the `merge_lists` dict with a boolean, e.g.
-# merge_lists: 'true'
----
-values: {}
-...