diff --git a/clusters/ceph_cluster/profiles/ceph01.example.org.pan b/clusters/ceph_cluster/profiles/ceph01.example.org.pan
deleted file mode 100644
index 7387af1..0000000
--- a/clusters/ceph_cluster/profiles/ceph01.example.org.pan
+++ /dev/null
@@ -1,8 +0,0 @@
-object template ceph01.example.org;
-
-include 'machine-types/ceph-server';
-
-#
-# software repositories (should be last)
-#
-include { PKG_REPOSITORY_CONFIG };
diff --git a/clusters/ceph_cluster/profiles/ceph02.example.org.pan b/clusters/ceph_cluster/profiles/ceph02.example.org.pan
deleted file mode 100644
index b0e7a41..0000000
--- a/clusters/ceph_cluster/profiles/ceph02.example.org.pan
+++ /dev/null
@@ -1,8 +0,0 @@
-object template ceph02.example.org;
-
-include 'machine-types/ceph-server';
-
-#
-# software repositories (should be last)
-#
-include { PKG_REPOSITORY_CONFIG };
diff --git a/clusters/ceph_cluster/profiles/ceph03.example.org.pan b/clusters/ceph_cluster/profiles/ceph03.example.org.pan
deleted file mode 100644
index 294d47c..0000000
--- a/clusters/ceph_cluster/profiles/ceph03.example.org.pan
+++ /dev/null
@@ -1,8 +0,0 @@
-object template ceph03.example.org;
-
-include 'machine-types/ceph-server';
-
-#
-# software repositories (should be last)
-#
-include { PKG_REPOSITORY_CONFIG };
diff --git a/clusters/ceph_cluster/site/ceph/cluster/params.pan b/clusters/ceph_cluster/site/ceph/cluster/params.pan
deleted file mode 100644
index 3885dfb..0000000
--- a/clusters/ceph_cluster/site/ceph/cluster/params.pan
+++ /dev/null
@@ -1,15 +0,0 @@
-unique template site/ceph/cluster/params;
-
-final variable CEPH_DEPLOY_PUBKEYS = list(
-);
-
-variable CEPH_NODES = list('ceph01.example.org', 'ceph02.example.org', 'ceph03.example.org');
-variable CEPH_CLUSTER_TEMPLATE = 'building';
-
-variable MDS_FQDNS = list('ceph01.example.org', 'ceph02.example.org');
-variable DEPLOY_FQDNS = list(CEPH_NODES[0]);
-
-variable CEPH_FSID = '230b20a6-f0ea-4d4e-bdc5-b751005ef6d8';
-variable CEPH_NETWORK = '10.20.30.0/24';
-variable CEPH_CLUSTER_NETWORK = CEPH_NETWORK;
-
diff --git a/clusters/ceph_cluster/site/ceph/common/params.pan b/clusters/ceph_cluster/site/ceph/common/params.pan
deleted file mode 100644
index 38de83b..0000000
--- a/clusters/ceph_cluster/site/ceph/common/params.pan
+++ /dev/null
@@ -1,5 +0,0 @@
-unique template site/ceph/common/params;
-
-final variable CEPH_VERSION = '9.2.0';
-
-final variable CEPH_MON_HOSTS = list("ceph01.example.org", "ceph02.example.org", "ceph03.example.org");
diff --git a/clusters/ceph_cluster/site/filesystems/ceph.pan b/clusters/ceph_cluster/site/filesystems/ceph.pan
deleted file mode 100644
index 7c3a873..0000000
--- a/clusters/ceph_cluster/site/filesystems/ceph.pan
+++ /dev/null
@@ -1,21 +0,0 @@
-unique template site/filesystems/ceph;
-
-
-variable MAKE_SEPERATE_VAR_PART = true;
-include 'site/filesystems/ceph-common';
-
-prefix '/system/blockdevices';
-# Boot disk sda partitions
-'partitions' = {
-    partitions_add(
-        'sda', dict('sda1', 1*GB,
-                 'sda2', 10*GB,
-                 'sda3', DISK_SWAP_SIZE,
-                 'sda4', 1*MB, #biosboot
-                 'sda5', 30*GB,
-                 'sda6', -1));
-    SELF['sda4']['flags'] = dict("bios_grub", true);
-    SELF;
-};
-
-include 'site/filesystems/ceph-basic';
diff --git a/clusters/opennebula/4.x/cluster.build.properties b/clusters/opennebula/4.x/cluster.build.properties
deleted file mode 100644
index 303dce7..0000000
--- a/clusters/opennebula/4.x/cluster.build.properties
+++ /dev/null
@@ -1 +0,0 @@
-cluster.pan.includes=sites/example clusters/opennebula/4.x non-grid/basic os standard
diff --git a/clusters/opennebula/4.x/profiles/hyp01.example.org.pan b/clusters/opennebula/4.x/profiles/hyp01.example.org.pan
deleted file mode 100644
index c8aab98..0000000
--- a/clusters/opennebula/4.x/profiles/hyp01.example.org.pan
+++ /dev/null
@@ -1,9 +0,0 @@
-object template hyp01.example.org;
-
-# Include OpenNebula hypervisor
-include 'site/one/node';
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/opennebula/4.x/profiles/one.example.org.pan b/clusters/opennebula/4.x/profiles/one.example.org.pan
deleted file mode 100644
index 4e2bc8d..0000000
--- a/clusters/opennebula/4.x/profiles/one.example.org.pan
+++ /dev/null
@@ -1,9 +0,0 @@
-object template one.example.org;
-
-# Include OpenNebula server
-include 'site/one/frontend';
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/opennebula/4.x/profiles/vm.example.org.pan b/clusters/opennebula/4.x/profiles/vm.example.org.pan
deleted file mode 100644
index fd4053f..0000000
--- a/clusters/opennebula/4.x/profiles/vm.example.org.pan
+++ /dev/null
@@ -1,10 +0,0 @@
-object template vm.example.org;
-
-# AII opennebula VM
-include 'site/one/onevm';
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
-
diff --git a/clusters/opennebula/4.x/site/config-vm.pan b/clusters/opennebula/4.x/site/config-vm.pan
deleted file mode 100644
index 3a57216..0000000
--- a/clusters/opennebula/4.x/site/config-vm.pan
+++ /dev/null
@@ -1,19 +0,0 @@
-unique template site/config-vm;
-
-# AII opennebula VM conf
-
-# Set network
-prefix "/system/opennebula";
-"vnet" = dict(
-    "eth0", "example.os",
-);
-
-# Set storage
-"datastore" = dict(
-    "vda", "ceph.example",
-);
-
-# set aii opennebula hooks
-final variable OPENNEBULA_AII_FORCE = true; 
-final variable OPENNEBULA_AII_ONHOLD = false;
-
diff --git a/clusters/opennebula/4.x/site/databases.pan b/clusters/opennebula/4.x/site/databases.pan
deleted file mode 100644
index 75405b3..0000000
--- a/clusters/opennebula/4.x/site/databases.pan
+++ /dev/null
@@ -1,18 +0,0 @@
-template site/databases;
-
-# Defines the mapping between the full hostname and the IP
-# address.
-final variable DB_IP = dict(
-    escape("one"),"192.168.0.24",
-    escape("hyp01"), "192.168.0.25",
-    escape("vm"), "192.168.0.26",
-);
-
-# Defines the mapping between the full hostname and the
-# physical machine.
-# A different hardware template must be used for each machine
-final variable DB_MACHINE = dict(
-    escape("one"),"hardware/machine/ibm/x3550/x_KDXXXX",
-    escape("hyp01"),"hardware/machine/ibm/hs21xm/blade_99HXXXX",
-    escape("vm"), "hardware/machine/one/example",
-);
diff --git a/clusters/opennebula/4.x/site/one/resources.pan b/clusters/opennebula/4.x/site/one/resources.pan
deleted file mode 100644
index f958980..0000000
--- a/clusters/opennebula/4.x/site/one/resources.pan
+++ /dev/null
@@ -1,30 +0,0 @@
-unique template site/one/resources;
-
-# datastores templates
-prefix "/software/components/opennebula/datastores/0";
-"name" = "ceph.example";
-"bridge_list" = list(FULL_HOSTNAME); # for now, do this from the headnode
-"ceph_host" = CEPH_MON_HOSTS;
-"ceph_secret" = CEPH_LIBVIRT_UUID;
-"ceph_user" = "libvirt";
-"ceph_user_key" = CEPH_LIBVIRT_SECRET;
-"datastore_capacity_check" = true;
-"pool_name" = "one";
-"type" = "IMAGE_DS";
-"rbd_format" = 2;
-
-prefix "/software/components/opennebula/datastores/1";
-"name" = "nfs.example";
-"datastore_capacity_check" = true;
-"ds_mad" = "fs";
-"tm_mad" = "shared";
-"type" = "IMAGE_DS";
-
-# untouchables resources
-prefix "/software/components/opennebula/untouchables";
-"datastores" = list('system');
-
-# extra conf
-prefix "/software/components/opennebula";
-"ssh_multiplex" = true;
-"tm_system_ds" = "ssh";
diff --git a/clusters/opennebula/4.x/site/one/variables.pan b/clusters/opennebula/4.x/site/one/variables.pan
deleted file mode 100644
index 2a6f154..0000000
--- a/clusters/opennebula/4.x/site/one/variables.pan
+++ /dev/null
@@ -1,14 +0,0 @@
-unique template site/one/variables;
-
-final variable ONEADMIN_PUBKEYS = list(
-'ssh-dss AAAAB3xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx== oneadmin@one.example.org',
-);
-
-
-# just generate one uuid per cluster
-final variable CEPH_LIBVIRT_UUID = "8271aaaa-385d-44d7-yyyy-xxxxxxxxxxxx";
-
-# set passwords
-final variable OPENNEBULA_ONEADMIN = EXAMPLE_OPENNEBULA_ONEADMIN;
-final variable OPENNEBULA_MYSQL_ADMIN = EXAMPLE_OPENNEBULA_MYSQL_ADMIN;
-final variable OPENNEBULA_MYSQL_ONEADMIN = EXAMPLE_OPENNEBULA_MYSQL_ONEADMIN;
diff --git a/clusters/opennebula/4.x/site/version_db.pan b/clusters/opennebula/4.x/site/version_db.pan
deleted file mode 100644
index c671663..0000000
--- a/clusters/opennebula/4.x/site/version_db.pan
+++ /dev/null
@@ -1,7 +0,0 @@
-unique template site/version_db;
-
-final variable OS_VERSION = dict(
-    escape("one.example.org"), "c7x-x86_64",
-    escape("hyp01.example.org"), "c7x-x86_64",
-    escape("vm.example.org"), "c7x-x86_64",
-);
diff --git a/clusters/openstack/icehouse/cluster.build.properties b/clusters/openstack/icehouse/cluster.build.properties
deleted file mode 100644
index 739f5e7..0000000
--- a/clusters/openstack/icehouse/cluster.build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-cluster.pan.includes=sites/example openstack/icehouse os quattor/23.9.0-rc1 standard 
-cluster.pan.dep.ignore=""
diff --git a/clusters/openstack/icehouse/profiles/cloud-controller.example.org.pan b/clusters/openstack/icehouse/profiles/cloud-controller.example.org.pan
deleted file mode 100644
index da9bed2..0000000
--- a/clusters/openstack/icehouse/profiles/cloud-controller.example.org.pan
+++ /dev/null
@@ -1,18 +0,0 @@
-@maintainer{
-  name = Jerome Pansanel
-  email = jerome.pansanel@iphc.cnrs.fr
-}
-
-@{
-  Example template that shows the configuration of an OpenStack Cloud
-  Controller
-}
-
-object template cloud-controller.example.org;
-
-include 'machine-types/openstack/cloud_controller';
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/openstack/icehouse/profiles/compute-node.example.org.pan b/clusters/openstack/icehouse/profiles/compute-node.example.org.pan
deleted file mode 100644
index a08a7e8..0000000
--- a/clusters/openstack/icehouse/profiles/compute-node.example.org.pan
+++ /dev/null
@@ -1,57 +0,0 @@
-@maintainer{
-  name = Jerome Pansanel
-  email = jerome.pansanel@iphc.cnrs.fr
-}
-
-@{
-  Example template that shows the configuration of an OpenStack Compute
-  node
-}
-
-object template compute-node.example.org;
-
-variable MGMT_INTERFACE ?= 'eth0';
-variable DATA_INTERFACE ?= 'eth1';
-variable DATA_BRIDGE ?= 'br-' + DATA_INTERFACE;
-variable BRIDGE_MAPPINGS ?= 'physnet1:' + DATA_BRIDGE;
-
-include 'machine-types/openstack/compute_node';
-
-#----------------------------------------------------------------------------
-# Network configuration
-#----------------------------------------------------------------------------
-
-include 'components/network/config';
-
-'/system/network/interfaces' = {
-    SELF[MGMT_INTERFACE] = dict(
-        'device', MGMT_INTERFACE,
-        'bootproto', 'dhcp',
-        'onboot', true,
-        'type', 'Ethernet',
-    );
-
-    SELF[DATA_BRIDGE] = dict(
-        'device', DATA_BRIDGE,
-        'type', 'OVSBridge',
-        'bootproto', 'static',
-        'ip', '10.0.0.2',
-        'netmask', '255.255.255.0',
-        'onboot', true,
-    );
-
-    SELF[DATA_INTERFACE] = dict(
-        'device', DATA_INTERFACE,
-        'type', 'OVSPort',
-        'bootproto', 'none',
-        'ovs_bridge', DATA_BRIDGE,
-        'onboot', true,
-    );
-
-    SELF;
-};
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/openstack/icehouse/profiles/network-node.example.org.pan b/clusters/openstack/icehouse/profiles/network-node.example.org.pan
deleted file mode 100644
index 97e20a4..0000000
--- a/clusters/openstack/icehouse/profiles/network-node.example.org.pan
+++ /dev/null
@@ -1,68 +0,0 @@
-@maintainer{
-name = Jerome Pansanel
-email = jerome.pansanel@iphc.cnrs.fr
-}
-
-@{
-Example template that shows the configuration of an OpenStack Network
-node
-}
-
-object template network-node.example.org;
-
-variable MGMT_INTERFACE ?= 'eth0';
-variable PUBLIC_INTERFACE ?= 'eth1';
-variable DATA_INTERFACE ?= 'eth2';
-variable PUBLIC_BRIDGE ?= 'br-ex';
-variable DATA_BRIDGE ?= 'br-' + DATA_INTERFACE;
-variable BRIDGE_MAPPINGS ?= 'physnet1:' + DATA_BRIDGE;
-
-include 'machine-types/openstack/network_node';
-
-#----------------------------------------------------------------------------
-# Network configuration
-#----------------------------------------------------------------------------
-
-include 'components/network/config';
-
-'/system/network/interfaces' = {
-    SELF[MGMT_INTERFACE] = dict(
-        'device', MGMT_INTERFACE,
-        'bootproto', 'dhcp',
-        'onboot', true,
-        'type', 'Ethernet',
-    );
-
-    SELF[PUBLIC_BRIDGE] = dict(
-        'device', DATA_BRIDGE,
-        'type', 'OVSBridge',
-        'bootproto', 'static',
-        'ip', '192.168.10.32',
-        'netmask', '255.255.255.0',
-        'onboot', true,
-    );
-
-    SELF[PUBLIC_INTERFACE] = dict(
-        'device', PUBLIC_INTERFACE,
-        'type', 'OVSPort',
-        'bootproto', 'none',
-        'ovs_bridge', PUBLIC_BRIDGE,
-        'onboot', true,
-    );
-
-    SELF[DATA_BRIDGE] = dict(
-        'device', DATA_BRIDGE,
-        'type', 'OVSBridge',
-        'bootproto', 'static',
-        'ip', '10.0.0.1',
-        'netmask', '255.255.255.0',
-        'onboot', true,
-    );
-
-    SELF;
-};
-
-#
-# software repositories (should be last)
-#
-include PKG_REPOSITORY_CONFIG;
diff --git a/clusters/openstack/icehouse/repository/config.pan b/clusters/openstack/icehouse/repository/config.pan
deleted file mode 100644
index c7a3d7f..0000000
--- a/clusters/openstack/icehouse/repository/config.pan
+++ /dev/null
@@ -1,38 +0,0 @@
-# NOTE: This template should be the LAST thing included in a
-# machine profile.  If you include packages after this template
-# then they will not be "resolved" and SPMA will not function
-# correctly.
-
-unique template repository/config;
-
-include 'pan/functions';
-
-include'repository/snapshot/snapshot_variables';
-
-# Repositories related to base OS and quattor client (should be first)
-include 'repository/config/os';
-
-# Local Repositories
-variable YUM_SITE_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
-variable SITE_REPOSITORY_LIST ?= list();
-variable SITE_REPOSITORY_CONFIG ?= dict();
-variable DEBUG = debug(
-    'OS_REPOSITORY_LIST = ' + to_string(OS_REPOSITORY_LIST) + "\n" +
-    'QUATTOR_REPOSITORY_LIST = ' + to_string(QUATTOR_REPOSITORY_LIST) + "\n" +
-    'SITE_REPOSITORY_LIST = ' + to_string(SITE_REPOSITORY_LIST) + "\n" +
-    'SITE_REPOSITORY_CONFIG = ' + to_string(SITE_REPOSITORY_CONFIG) + "\n"
-);
-include 'quattor/functions/repository';
-'/software/repositories' = add_repositories(SITE_REPOSITORY_LIST);
-'/software/repositories' = repository_config(SITE_REPOSITORY_CONFIG);
-
-# Repositories related to Nagios
-include if (is_defined(REPOSITORY_CONFIG_NAGIOS)) if_exists(REPOSITORY_CONFIG_NAGIOS);
-
-# Register repository changes with yum based spma
-include 'components/spma/config';
-'/software/components/spma/register_change' = append('/software/repositories');
-
-# Cleanup repository information
-include 'components/spma/config';
-include 'components/spma/repository_cleanup';
diff --git a/clusters/openstack/icehouse/site/cluster_info.pan b/clusters/openstack/icehouse/site/cluster_info.pan
deleted file mode 100644
index f8cb69b..0000000
--- a/clusters/openstack/icehouse/site/cluster_info.pan
+++ /dev/null
@@ -1,43 +0,0 @@
-
-template site/cluster_info;
-
-#
-# basic site information
-#
-"/system/cluster/name" = "Icehouse";
-"/system/cluster/type" = "batch";
-"/system/state" = "production";
-"/system/siterelease" = "SL6";
-"/system/rootmail" = "cloud.support@example.org";
-
-# Use OS templates for generic major version
-variable OS_FLAVOUR_ENABLED ?= true;
-
-# YUM Repository snapshots
-variable YUM_SNAPSHOT_DATE ?= '20150223';
-variable AII_OSINSTALL_ROOT = '/yum/snapshots/'+YUM_SNAPSHOT_DATE;
-
-# Set to true if you want to deploy machines in these clusster with an
-# AII server running Quattor 13.1.x.
-# It is recommended to define this variable to true only during the installation
-# phase and to reset it to false afterwards.
-# You can also override the default value defined here in a specific profile.
-variable AII_V2_INSTALL ?= false;
-
-#
-# OS version definition
-#
-variable NODE_OS_VERSION_DB = "site/os/version_db";
-variable NODE_OS_VERSION_DEFAULT = "sl660-x86_64";
-
-
-# Default repository configuration template for the cluster
-variable PKG_REPOSITORY_CONFIG ?= 'repository/config';
-
-
-#
-# set root password on machines
-#
-include 'components/accounts/config';
-"/software/components/accounts/rootpwd" ?= "$1$57qRuCXe$NPngMkg4BrLBf5hfJzJh21";
-"/software/components/accounts/shadowpwd" = true;