diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
deleted file mode 100755
index adb4bc720421eaa8a0794af317b26611e4f74856..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-1.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.1",
-      "ip6": "fe80::216:36ff:fee0:8292",
-      "mac": "00:16:36:e0:82:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/1",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:82:93",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-1-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.1",
-      "ip6": null,
-      "mac": "00:16:36:e0:8e:3e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-1-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
deleted file mode 100755
index abd652888ae8364bc6c49e3ecbf5b02fb09193f0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-10.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0D8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.10",
-      "ip6": "fe80::216:36ff:fee0:801a",
-      "mac": "00:16:36:e0:80:1a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-10.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/10",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:80:1b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-10-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.10",
-      "ip6": null,
-      "mac": "00:16:36:e0:8e:8d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-10-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-10"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
deleted file mode 100644
index 5a2d6570e2c959cd20b468a05a6360e770de96e8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-100.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT03C"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.100",
-      "ip6": "fe80::21b:24ff:fe2d:f6ff",
-      "mac": "00:1b:24:2d:f6:ff",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-100.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/20",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:00",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-100-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.100",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:e7",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-100-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-100"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
deleted file mode 100644
index ff084715ffb19b70f7cb6901204f6b0e22753330..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-101.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT06C"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.101",
-      "ip6": "fe80::21b:24ff:fe2d:f89b",
-      "mac": "00:1b:24:2d:f8:9b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-101.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/30",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:9c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-101-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.101",
-      "ip6": null,
-      "mac": "00:c0:9f:00:00:01",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-101-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-101"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
deleted file mode 100644
index 68880dd0358d705ad59facbf200800f893050b84..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-102.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0C6"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.102",
-      "ip6": "fe80::21b:24ff:fe2d:b71f",
-      "mac": "00:1b:24:2d:b7:1f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-102.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/31",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b7:20",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-102-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.102",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:56",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-102-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-102"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
deleted file mode 100644
index 94b1df25ca1d51ca9df441df49291949ccb24353..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-103.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT067"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.103",
-      "ip6": "fe80::21b:24ff:fe2d:b60f",
-      "mac": "00:1b:24:2d:b6:0f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-103.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/32",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b6:10",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-103-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.103",
-      "ip6": null,
-      "mac": "00:1b:24:2d:bf:ea",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-103-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "SEAGATE ST32502N",
-      "rev": "n/a",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-103"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
deleted file mode 100644
index 2b1ee2f9544761755a8f24009de98f4c7b3b1ecc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-104.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT098"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.104",
-      "ip6": "fe80::216:36ff:fee0:7902",
-      "mac": "00:16:36:e0:79:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-104.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/33",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:79:03",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-104-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.104",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:e6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-104-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-104"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
deleted file mode 100644
index 6b2684b4a40e5c057fdf22fc506b802869cc51b6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-105.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT085"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.105",
-      "ip6": "fe80::21b:24ff:fe2d:f97b",
-      "mac": "00:1b:24:2d:f9:7b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-105.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/34",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f9:7c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-105-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.105",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-105-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-105"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
deleted file mode 100644
index ce6b13f9a5ca4f58290719fb5aab7f70c17e4d48..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-106.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT064"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.106",
-      "ip6": "fe80::21b:24ff:fe2d:f7b7",
-      "mac": "00:1b:24:2d:f7:b7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-106.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/35",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:b8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-106-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.106",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:9a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-106-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-106"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
deleted file mode 100644
index d6e9c9b3bb9df4efa99fb5198631b79b8d3f66a3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-107.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT097"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.107",
-      "ip6": "fe80::21b:24ff:fe2d:f833",
-      "mac": "00:1b:24:2d:f8:33",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-107.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/36",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:34",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-107-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.107",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:60",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-107-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-107"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
deleted file mode 100644
index 7c83ca92ee06c73b9746b2ffe98f28d73874d0a9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-108.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT08D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.108",
-      "ip6": "fe80::21b:24ff:fe2d:f5eb",
-      "mac": "00:1b:24:2d:f5:eb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-108.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/37",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:ec",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-108-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.108",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:2c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-108-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-108"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
deleted file mode 100644
index d63bc8f9a92162d8bdf4bd9fb8afa63a23fc5eef..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-109.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT07D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.109",
-      "ip6": "fe80::21b:24ff:fe2d:f7f7",
-      "mac": "00:1b:24:2d:f7:f7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-109.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/38",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:f8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-109-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.109",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:79",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-109-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-109"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
deleted file mode 100755
index d6e5ce11e71d09bd26f78f81d2fad8d1ed83e786..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-11.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.11",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:ef:48",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-11.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/11",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ef:49",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-11-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.11",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:99",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-11-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-11"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
deleted file mode 100644
index 1c39ffd2be852ab6c9d3d6bcf069d7e51a491176..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-110.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0CD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.110",
-      "ip6": "fe80::216:36ff:fee0:848e",
-      "mac": "00:16:36:e0:84:8e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-110.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/39",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:84:8f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-110-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.110",
-      "ip6": null,
-      "mac": "00:16:36:e0:8f:2d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-110-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-110"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
deleted file mode 100644
index afa94ad92afb0edfb9a1f5b5270f067d172f6901..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-111.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT07A"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.111",
-      "ip6": "fe80::21b:24ff:fe2d:f5bb",
-      "mac": "00:1b:24:2d:f5:bb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-111.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/40",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:bc",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-111-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.111",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:48",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-111-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-111"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
deleted file mode 100644
index 5f9ce68261ae3f0262cf600885716612c5084327..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-112.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT035"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.112",
-      "ip6": "fe80::216:36ff:fed2:f3e4",
-      "mac": "00:16:36:d2:f3:e4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-112.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/41",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:e5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-112-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.112",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:6a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-112-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-112"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
deleted file mode 100644
index 955ca112fbb8d53a2ad47648d0cf0eac01882f23..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-113.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT039"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.113",
-      "ip6": "fe80::216:36ff:fed2:f3d4",
-      "mac": "00:16:36:d2:f3:d4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-113.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/42",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:d5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-113-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.113",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:65",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-113-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "SEAGATE ST32502N",
-      "rev": "n/a",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-113"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
deleted file mode 100644
index d2c7b26ee5021bcf0f559cee613d5a566f822a93..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-114.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT090"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.114",
-      "ip6": "fe80::21b:24ff:fe2d:f86b",
-      "mac": "00:1b:24:2d:f8:6b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-114.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/43",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:6c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-114-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.114",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:6f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-114-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-114"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
deleted file mode 100644
index 9278a41a0fe120d3c27b709601b5d96ee7a4e46f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-115.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0A9"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.115",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:f4:10",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-115.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/44",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f4:11",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-115-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.115",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-115-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-115"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
deleted file mode 100644
index 115889f37feda05f2385911a8378dc3c9d4bfe4c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-116.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT06B"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.116",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:af",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-116.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/45",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:b0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-116-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.116",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-116-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-116"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
deleted file mode 100644
index 19e35532d6842fa67054f9c4b06f36e02f2367d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-117.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0CF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.117",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:b8:a7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-117.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/46",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b8:a8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-117-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.117",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-117-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-117"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
deleted file mode 100644
index 688f9e3486aa170cbda56187f68f7ad6d77aec4c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-118.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT071"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.118",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:0b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-118.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/47",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:0c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-118-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.118",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-118-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "SEAGATE ST32502N",
-      "rev": "n/a",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-118"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
deleted file mode 100644
index 0dc7ea7affbea175e6fe1e9def30804ac7dfc669..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-119.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A6"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.119",
-      "ip6": "fe80::21b:24ff:fe2d:fa83",
-      "mac": "00:1b:24:2d:fa:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-119.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/48",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:84",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-119-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.119",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:ee",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-119-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-119"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
deleted file mode 100755
index 69f4d38880b55ba22dc7a5ac042016c6fcc40014..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-12.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT065"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.12",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:13",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-12.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/12",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:14",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-12-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.12",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:ec",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-12-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-12"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
deleted file mode 100644
index 8543d3a80da624d95b93c4bae733241621c276ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-120.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT067"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.120",
-      "ip6": "fe80::21b:24ff:fe2d:f687",
-      "mac": "00:1b:24:2d:f6:87",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-120.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/1",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:88",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-120-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.120",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:09",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-120-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-120"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
deleted file mode 100644
index cac9b015b990a90fdc7ed5045b57a6977520d78b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-121.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.121",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:3d:ca:a1",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-121.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/21",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-121-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.121",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-121-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-121"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
deleted file mode 100644
index c6a7fab1ff134e8bc66784a553618500937cfc0b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-122.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT06A"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.122",
-      "ip6": "fe80::21b:24ff:fe2d:f83b",
-      "mac": "00:1b:24:2d:f8:3b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-122.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/22",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:3c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-122-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.122",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:64",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-122-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-122"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
deleted file mode 100644
index 954b78f00ff92319aad299208282b09953b674b7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-123.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.123",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:ff:d3:6e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-123.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/23",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:ff:d3:6f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-123-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.123",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-123-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-123"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
deleted file mode 100644
index 12fc26beb2b557b63108733735368540a1ba6049..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-124.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT038"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.124",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:2a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-124.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/24",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:2b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-124-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.124",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-124-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-124"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
deleted file mode 100644
index f25006e56944c89db35dbd9c5a5faa2707761078..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-125.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.125",
-      "ip6": "fe80::216:36ff:feff:d48a",
-      "mac": "00:16:36:ff:d4:8a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-125.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/25",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:ff:d4:8b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-125-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.125",
-      "ip6": null,
-      "mac": "00:16:36:ff:d9:7a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-125-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-125"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
deleted file mode 100644
index 03c222c136fcee4de10d43c0e663604faf0244cf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-126.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT09C"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.126",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:aa",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-126.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/26",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:ab",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-126-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.126",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-126-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-126"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
deleted file mode 100644
index a24a223dec413b5e63f12a664965ac3bf917a5bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-127.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.127",
-      "ip6": "fe80::21b:24ff:fe3d:e541",
-      "mac": "00:1b:24:3d:e5:41",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-127.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/27",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:3d:e5:42",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-127-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.127",
-      "ip6": null,
-      "mac": "00:1b:24:3d:f6:29",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-127-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-127"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
deleted file mode 100644
index 8d8526a064ebb18b2a3f6575af4aa615026e503d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-128.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.128",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:ff:d3:ea",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-128.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/28",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-128-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.128",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-128-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-128"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
deleted file mode 100644
index eb5ae8086da639ab273dbed5d221daa4ed4a7c52..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-129.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.129",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:3d:e4:a5",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-129.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/29",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-129-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.129",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-129-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-129"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
deleted file mode 100755
index 202d50354709297633c7467246dee050a99b4bf0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-13.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0A0"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.13",
-      "ip6": "fe80::216:36ff:fee0:79c2",
-      "mac": "00:16:36:e0:79:c2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-13.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/13",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:79:c3",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-13-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.13",
-      "ip6": null,
-      "mac": "00:16:36:e0:8c:16",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-13-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-13"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
deleted file mode 100644
index 585307fca04724a8af6ad7341cd311ed85ed1491..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-130.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT062"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.130",
-      "ip6": "fe80::21b:24ff:fe2d:f71b",
-      "mac": "00:1b:24:2d:f7:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-130.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/2",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:1c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-130-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.130",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:ee",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-130-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-130"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
deleted file mode 100644
index 221789c027edae85bedd0f7242350a9d05715de8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-131.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0DF"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.131",
-      "ip6": "fe80::216:36ff:fee0:879a",
-      "mac": "00:16:36:e0:87:9a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-131.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/3",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:87:9b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-131-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.131",
-      "ip6": null,
-      "mac": "00:16:36:e0:8f:d8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-131-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-131"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
deleted file mode 100644
index 6818f285af442fbb16c7f8da4f78e97df8ecf5c9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-132.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT02A"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.132",
-      "ip6": "fe80::216:36ff:fed2:f254",
-      "mac": "00:16:36:d2:f2:54",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-132.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f2:55",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-132-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.132",
-      "ip6": null,
-      "mac": "00:16:36:d2:f6:ae",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-132-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-132"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
deleted file mode 100644
index 3d1b9b3fa7619a48a3f4b1fead06418fd57f0d1b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-133.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A1"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.133",
-      "ip6": "fe80::21b:24ff:fe2d:f6f3",
-      "mac": "00:1b:24:2d:f6:f3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-133.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/5",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:f4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-133-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.133",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:e4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-133-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-133"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
deleted file mode 100644
index 8bc59e6ea0daf47a56b39248fe9df501f7e20c34..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-134.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT02D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.134",
-      "ip6": "fe80::216:36ff:fedf:8c6",
-      "mac": "00:16:36:df:08:c6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-134.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/6",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:df:08:c7",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-134-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.134",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:a4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-134-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-134"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
deleted file mode 100644
index c62912c7cae9a6965bc57b836263b8d93d27ae29..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-135.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A2"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.135",
-      "ip6": "fe80::21b:24ff:fe2d:f90f",
-      "mac": "00:1b:24:2d:f9:0f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-135.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/7",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f9:10",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-135-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.135",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:46",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-135-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-135"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
deleted file mode 100644
index 4ef9fa5951b82afffc6ac7a6a72117ed5ec2f4ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-136.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT02F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.136",
-      "ip6": "fe80::216:36ff:fed2:f354",
-      "mac": "00:16:36:d2:f3:54",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-136.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/8",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:55",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-136-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.136",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:4f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-136-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-136"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
deleted file mode 100644
index 43887023e0e7a34d3791a03bad73b1218c89611c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-137.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0A4"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.137",
-      "ip6": "fe80::216:36ff:fee0:7966",
-      "mac": "00:16:36:e0:79:66",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-137.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/9",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:79:67",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-137-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.137",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:ff",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-137-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "SEAGATE ST32500N",
-      "rev": "n/a",
-      "size": 250059350016,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-137"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
deleted file mode 100644
index 70ebfb999edc38e9a29ac4d76b49e58bdfe61180..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-138.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT078"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.138",
-      "ip6": "fe80::21b:24ff:fe2d:f6df",
-      "mac": "00:1b:24:2d:f6:df",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-138.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/10",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:e0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-138-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.138",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:de",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-138-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-138"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
deleted file mode 100644
index bac66e402e5e7924a90ca5ed8c8e7b71f8efd90d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-139.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0D4"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.139",
-      "ip6": "fe80::216:36ff:fee0:85b2",
-      "mac": "00:16:36:e0:85:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-139.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/11",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:85:b3",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-139-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.139",
-      "ip6": null,
-      "mac": "00:16:36:e0:8f:67",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-139-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-139"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
deleted file mode 100755
index da38b2bde3b11244f75b924252d05fbd29181fde..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-14.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT01F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.14",
-      "ip6": "fe80::216:36ff:fed2:f1c4",
-      "mac": "00:16:36:d2:f1:c4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-14.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/14",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f1:c5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-14-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.14",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:1c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-14-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-14"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
deleted file mode 100644
index f62b4f176d417cf047a5b374bdaa9960452fe698..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-140.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT069"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.140",
-      "ip6": "fe80::21b:24ff:fe2d:f803",
-      "mac": "00:1b:24:2d:f8:03",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-140.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet3/12",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:04",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-140-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.140",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:7c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-140-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "SEAGATE ST32502N",
-      "rev": "n/a",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Seagate"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-140"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
deleted file mode 100755
index 8e180b8bf2529e0615392c03571a67b9c597560c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-15.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT088"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.15",
-      "ip6": "fe80::216:36ff:fe7b:4651",
-      "mac": "00:16:36:7b:46:51",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-15.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/15",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:7b:46:52",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-15-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.15",
-      "ip6": null,
-      "mac": "00:16:36:7b:48:7c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-15-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-15"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
deleted file mode 100755
index 46336daca9ff1ab2a236c2260992374b34197612..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-16.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT017"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.16",
-      "ip6": "fe80::216:36ff:fedf:90e",
-      "mac": "00:16:36:df:09:0e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-16.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/16",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:df:09:0f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-16-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.16",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:74",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-16-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7250S",
-      "rev": "K2AO",
-      "size": 500107862016,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-16"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
deleted file mode 100755
index 1808a0baa27cbdc773f90e65600d1fedfba162d1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-17.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "11/15/2007",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B25"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT081"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.17",
-      "ip6": "fe80::21b:24ff:fe2d:f5c3",
-      "mac": "00:1b:24:2d:f5:c3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-17.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/17",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:c4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-17-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.17",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:4a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-17-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-17"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
deleted file mode 100755
index a4f36a3b06e6cadafd7f3b14a93c3c17d9526ed6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-18.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT014"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.18",
-      "ip6": "fe80::216:36ff:fed2:f040",
-      "mac": "00:16:36:d2:f0:40",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-18.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/18",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f0:41",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-18-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.18",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:a0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-18-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-18"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
deleted file mode 100755
index f14dba1cf531f84bb8e9536d047b149ccbfba0b1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-19.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0702QBT014"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.19",
-      "ip6": "fe80::216:36ff:fed7:4d40",
-      "mac": "00:16:36:d7:4d:40",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-19.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/19",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d7:4d:41",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-19-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.19",
-      "ip6": null,
-      "mac": "00:16:36:d7:5b:dc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-19-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-19"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
deleted file mode 100755
index 2b3dcc57353c2570641ce3e05ffe8c7a9ff0c709..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-2.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT082"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.2",
-      "ip6": "fe80::21b:24ff:fe2d:f883",
-      "mac": "00:1b:24:2d:f8:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-2.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/2",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:84",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-2-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.2",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:4c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-2-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-2"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
deleted file mode 100755
index 8d4b749b40f36108ac1a4df8943faa9479e9d0ac..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-20.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0702QBT020"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.20",
-      "ip6": "fe80::216:36ff:fed7:4ef4",
-      "mac": "00:16:36:d7:4e:f4",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-20.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/20",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d7:4e:f5",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-20-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.20",
-      "ip6": null,
-      "mac": "00:16:36:d7:5c:c2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-20-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-20"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
deleted file mode 100755
index f00a73e4efe086161197d014178a023675d3e387..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-21.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT07F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.21",
-      "ip6": "fe80::21b:24ff:fe3d:ca9d",
-      "mac": "00:1b:24:3d:ca:9d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-21.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/21",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:3d:ca:9e",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-21-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.21",
-      "ip6": null,
-      "mac": "00:1b:24:3d:cb:95",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-21-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-21"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
deleted file mode 100755
index df980c917c14929ae07147a233997e586d1321da..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-22.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT070"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.22",
-      "ip6": "fe80::21b:24ff:fe2d:f863",
-      "mac": "00:1b:24:2d:f8:63",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-22.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/22",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:64",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-22-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.22",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:69",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-22-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-22"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
deleted file mode 100755
index 0fac9a612954de4291991e426c1fb3a2d345c262..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-23.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT080"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.23",
-      "ip6": "fe80::21b:24ff:fe2d:f6e7",
-      "mac": "00:1b:24:2d:f6:e7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-23.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/23",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:e8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-23-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.23",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:e0",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-23-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-23"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
deleted file mode 100755
index 1c9c6e41e5bccaa0eff514842cf4d8640219385c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-24.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A5"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.24",
-      "ip6": "fe80::21b:24ff:fe2d:fa7f",
-      "mac": "00:1b:24:2d:fa:7f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-24.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/24",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:80",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-24-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.24",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:ed",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-24-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-24"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
deleted file mode 100755
index 914ddb196ade44929ac67132eecbd439be8f5eba..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-25.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.25",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:fa:43",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-25.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/25",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:44",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-25-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.25",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:12",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-25-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-25"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
deleted file mode 100755
index 4b461f2e45dd140480eb81971ad6b6172d989bb9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-26.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT095"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.26",
-      "ip6": "fe80::21b:24ff:fe2d:f7b3",
-      "mac": "00:1b:24:2d:f7:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-26.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/26",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:b4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-26-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.26",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:9b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-26-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-26"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
deleted file mode 100755
index f80b466a78b8fa80fd77084d7d3f32c3d44da0fa..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-27.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT074"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.27",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f8:37",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-27.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/27",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:38",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-27-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.27",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:61",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-27-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7250S",
-      "rev": "K2AO",
-      "size": 500107862016,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-27"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
deleted file mode 100755
index 3103914b42c9e91edb3c19f8bb839a53947352c0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-28.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT026"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.28",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:ec:d0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-28.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/28",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ec:d1",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-28-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.28",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:01",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-28-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-28"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
deleted file mode 100755
index 6d038c2535c2643faca3570e8f27f9cbc9e67a57..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-29.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT073"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.29",
-      "ip6": "fe80::21b:24ff:fe2d:f5bf",
-      "mac": "00:1b:24:2d:f5:bf",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-29.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/29",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:c0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-29-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.29",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:49",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-29-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-29"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
deleted file mode 100755
index f7198d4b7e1d23faa7fc87030c978008cc4f79b6..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-3.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT013"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.3",
-      "ip6": "fe80::216:36ff:fedf:912",
-      "mac": "00:16:36:df:09:12",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-3.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/3",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:df:09:13",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-3-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.3",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:75",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-3-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-3"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
deleted file mode 100755
index 7369858d94d52e9a3e4aafb0fcfc0683d08d2c41..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-30.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT019"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.30",
-      "ip6": "fe80::216:36ff:fedf:8c2",
-      "mac": "00:16:36:df:08:c2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-30.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/30",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:df:08:c3",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-30-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.30",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:a3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-30-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-30"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
deleted file mode 100755
index 8953900b37c4e0f01e90b84f9a91982ccf2c0e2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-31.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT02C"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.31",
-      "ip6": "fe80::216:36ff:fed2:f358",
-      "mac": "00:16:36:d2:f3:58",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-31.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/31",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:59",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-31-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.31",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:50",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-31-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-31"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
deleted file mode 100755
index 570595ead8ef90ade41b23d95416c8e3e331700d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-32.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0AA"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.32",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:92",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-32.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/32",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:93",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-32-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.32",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:ca",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-32-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-32"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
deleted file mode 100755
index 8d0d56b11eda5d1a6d7a939eb3983008ab59194c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-33.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.33",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:79:5e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-33.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/33",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:79:5f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-33-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.33",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:fd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-33-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-33"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
deleted file mode 100755
index 3b352e4a00142e23cf4995f8405329ac18759db9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-34.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0D5"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.34",
-      "ip6": "fe80::216:36ff:fee0:81d6",
-      "mac": "00:16:36:e0:81:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-34.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/34",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:81:d7",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-34-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.34",
-      "ip6": null,
-      "mac": "00:16:36:e0:8e:12",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-34-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-34"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
deleted file mode 100755
index dc8320c798abb527619fdbf1ebbcf592b98510e1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-35.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT084"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.35",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-35.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/37",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:84",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-35-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.35",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:07",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-35-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-35"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
deleted file mode 100755
index 1789fff719045415e3613c2d8a310d6cc109fbca..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-36.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT061"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.36",
-      "ip6": "fe80::21b:24ff:fe2d:f717",
-      "mac": "00:1b:24:2d:f7:17",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-36.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/35",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:18",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-36-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.36",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:ed",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-36-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-36"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
deleted file mode 100755
index e35d52c94b132549c62c7d4bb93caa58f99dabb0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-37.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.37",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:47",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-37.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/36",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:48",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-37-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.37",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:11",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-37-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-37"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
deleted file mode 100755
index 9c258b9c570b3504044f294b2096045bbac1413e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-38.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT016"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.38",
-      "ip6": "fe80::216:36ff:fedf:90a",
-      "mac": "00:16:36:df:09:0a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-38.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/38",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:df:09:0b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-38-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.38",
-      "ip6": null,
-      "mac": "00:16:36:d2:f6:e1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-38-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-38"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
deleted file mode 100755
index ba31a40969f4b1bcb1e9db4f8852d6564a1da8c7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-39.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0710QBT025"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.39",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:f0:3c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-39.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/39",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f0:3d",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-39-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.39",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:9f",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-39-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-39"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
deleted file mode 100755
index e8395a4d72030dbf4a74420b97871d8966d91be0..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-4.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0E1"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.4",
-      "ip6": "fe80::216:36ff:fee0:7ed6",
-      "mac": "00:16:36:e0:7e:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-4.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:7e:d7",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-4-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.4",
-      "ip6": null,
-      "mac": "00:16:36:e0:8d:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-4-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-4"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
deleted file mode 100755
index d79939ff3e3e319a24ce78607f24a6af7adb731e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-40.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT042"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.40",
-      "ip6": "fe80::216:36ff:fed2:ef44",
-      "mac": "00:16:36:d2:ef:44",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-40.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/40",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ef:45",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-40-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.40",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:97",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-40-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-40"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
deleted file mode 100755
index c3d5b5a510f27ad5f8f401027816d1503e3ab0bf..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-41.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.41",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:36",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-41.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/1",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:37",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-41-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.41",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:b3",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-41-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-41"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
deleted file mode 100755
index ddd386216a34fb80201a88177776ff3af26d794e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-42.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT09F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.42",
-      "ip6": "fe80::216:36ff:fee0:796a",
-      "mac": "00:16:36:e0:79:6a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-42.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/2",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:79:6b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-42-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.42",
-      "ip6": null,
-      "mac": "00:16:36:e0:8c:00",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-42-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-42"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
deleted file mode 100755
index c85c286e0ec27e27b8b83d38ea6b3e11a1d40708..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-43.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.43",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:f3:9c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-43.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/3",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:9d",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-43-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.43",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-43-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-43"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
deleted file mode 100755
index 99739bc39825d0f3f5d33264ea58358b6c3206b4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-44.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0E7"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.44",
-      "ip6": "fe80::21b:24ff:fe2d:f8f3",
-      "mac": "00:1b:24:2d:f8:f3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-44.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:f4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-44-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.44",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:40",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-44-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-44"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
deleted file mode 100755
index b79a99bf21015af80f428caa1376c90dffa44744..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-45.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.45",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:9f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-45.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/5",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:a0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-45-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.45",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:1a",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-45-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-45"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
deleted file mode 100755
index d5e156c0a7255acb351d2d2b6a39d556c561cf15..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-46.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.46",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:fa:a3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-46.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/6",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-46-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.46",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-46-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-46"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
deleted file mode 100755
index 533aea1f66bfc7a9fe599c7d40e663116fd8019d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-47.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C3"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.47",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:fa:3f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-47.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/7",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:40",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-47-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.47",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:11",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-47-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-47"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
deleted file mode 100755
index 3e2bc6e0cf18745eed20f65d8278a8826e72a318..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-48.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0D3"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.48",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:ab",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-48.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/8",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:ac",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-48-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.48",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:20",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-48-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-48"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
deleted file mode 100755
index 2ce4bd1e693cb38b4033efb72db3a1a99c046402..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-49.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT06E"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.49",
-      "ip6": "fe80::21b:24ff:fe2d:f64b",
-      "mac": "00:1b:24:2d:f6:4b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-49.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/9",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:4c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-49-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.49",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:13",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-49-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-49"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
deleted file mode 100755
index 33778954ff806c1363d1be6f73a0bca284be8c01..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-5.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT046"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.5",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:2e",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-5.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/5",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:2f",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-5-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.5",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:b1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-5-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-5"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
deleted file mode 100755
index abd823755554ac0e5584b2310ba4ae61f6f58039..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-50.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.50",
-      "ip6": "fe80::216:36ff:fee7:7805",
-      "mac": "00:16:36:e7:78:05",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-50.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/10",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e7:78:06",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-50-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.50",
-      "ip6": null,
-      "mac": "00:16:36:e7:80:a6",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-50-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-50"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
deleted file mode 100755
index 9b9c4a7a8ca812a318bde03f20dc66c33cdea700..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-51.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A0"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.51",
-      "ip6": "fe80::21b:24ff:fe2d:f9bf",
-      "mac": "00:1b:24:2d:f9:bf",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-51.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/11",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f9:c0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-51-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.51",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:c2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-51-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-51"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
deleted file mode 100755
index 2631f6d1110667ef2ee4712fbe0a9c278b847a9f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-52.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0A8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.52",
-      "ip6": "fe80::21b:24ff:fe2d:f8cb",
-      "mac": "00:1b:24:2d:f8:cb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-52.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/12",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:cc",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-52-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.52",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:36",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-52-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-52"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
deleted file mode 100755
index 9a2a26c9b200e624845ed233c4feb85bafe5e672..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-53.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0E6"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.53",
-      "ip6": "fe80::21b:24ff:fe2d:f663",
-      "mac": "00:1b:24:2d:f6:63",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-53.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/13",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:64",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-53-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.53",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:1b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-53-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-53"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
deleted file mode 100755
index 2513662ab7cd4b5b5c98213c6ec58bdd8312558d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-54.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT038"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.54",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f8:8b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-54.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/14",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:8c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-54-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.54",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:4e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-54-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-54"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
deleted file mode 100755
index b81d494b484380e993ad9c309db5507a9ce6d893..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-55.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0AE"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.55",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f9:d7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-55.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/15",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f9:d8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-55-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.55",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:c9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-55-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-55"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
deleted file mode 100755
index 4160b60d13e8e2a87fc24d814b0a360704cfb983..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-56.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0D0"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.56",
-      "ip6": "fe80::21b:24ff:fe2d:b9db",
-      "mac": "00:1b:24:2d:b9:db",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-56.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/16",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b9:dc",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-56-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.56",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c1:2d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-56-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-56"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
deleted file mode 100755
index b2631acf4c9aedf588b6d497414fb40c1c58771f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-57.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0C5"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.57",
-      "ip6": "fe80::21b:24ff:fe2d:b90b",
-      "mac": "00:1b:24:2d:b9:0b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-57.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/17",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b9:0c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-57-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.57",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:f9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-57-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-57"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
deleted file mode 100755
index 65fc443b7fa439652cc14a73d651cc51c89cf977..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-58.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0C3"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.58",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:b9:13",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-58.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/18",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b9:14",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-58-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.58",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:fb",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-58-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-58"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
deleted file mode 100755
index fc1fe64f7cfbc068432234e6783d039293043b28..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-59.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.59",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:07",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-59.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/19",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:08",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-59-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.59",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:e9",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-59-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-59"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
deleted file mode 100755
index 25dd282263de77eee304082d56c154a95a7d9e5b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-6.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.6",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:ee:f8",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-6.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/6",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ee:f9",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-6-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.6",
-      "ip6": null,
-      "mac": "00:16:36:d2:f7:dd",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-6-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-6"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
deleted file mode 100755
index 87e79c6cf02c1589ea677416c008d6d8d42f9081..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-60.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.60",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:3b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-60.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/20",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:3c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-60-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.60",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:0d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-60-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-60"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
deleted file mode 100755
index 0a916dcf04d42589b8c172d84c3008dda9fff211..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-61.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.61",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:c7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-61.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/21",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:c8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-61-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.61",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:9e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-61-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-61"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
deleted file mode 100755
index 55322a69610e687b825b370436be6924991303e7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-62.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT03A"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.62",
-      "ip6": "fe80::21b:24ff:fe2d:f79b",
-      "mac": "00:1b:24:2d:f7:9b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-62.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/22",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:9c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-62-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.62",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:94",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-62-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-62"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
deleted file mode 100755
index 44e8fa49449b2d8f1b77bada09b2aad48db6b90c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-63.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0C9"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.63",
-      "ip6": "fe80::21b:24ff:fe2d:b717",
-      "mac": "00:1b:24:2d:b7:17",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-63.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/23",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b7:18",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-63-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.63",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:54",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-63-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-63"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
deleted file mode 100755
index df3de4e667af80374ec431200a3a6af56daa39e4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-64.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "05/20/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3D15"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2 with Dual Core.xxxxxxxxx",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.64",
-      "ip6": "fe80::223:8bff:fe8a:3669",
-      "mac": "00:23:8b:8a:36:69",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-64.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/24",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:23:8b:8a:36:6a",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-64-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.64",
-      "ip6": null,
-      "mac": "00:23:8b:8a:34:4e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-64-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-64"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
deleted file mode 100755
index 4ebd4aebf3e25e64cd06c494d6ce3ddde7c95243..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-65.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0C7"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.65",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:1d:ea:9a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-65.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/25",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:1d:ea:9b",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-65-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.65",
-      "ip6": null,
-      "mac": "00:1b:24:1d:ee:58",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-65-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-65"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
deleted file mode 100755
index 43085d446335bae17dd851b69ab1c43c55b0a380..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-66.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT03D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.66",
-      "ip6": "fe80::21b:24ff:fe2d:f79f",
-      "mac": "00:1b:24:2d:f7:9f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-66.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/26",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:a0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-66-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.66",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:98",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-66-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-66"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
deleted file mode 100755
index 284f7a12f3f05ac5374ebb5dd226ffabdbcdc40e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-67.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT039"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.67",
-      "ip6": "fe80::21b:24ff:fe2d:f8d3",
-      "mac": "00:1b:24:2d:f8:d3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-67.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/27",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:d4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-67-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.67",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:38",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-67-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-67"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
deleted file mode 100755
index 631c87862f8ca139409029d6ca623d8fb20f3da7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-68.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "11/15/2007",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B25"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.68",
-      "ip6": "fe80::21b:24ff:fee0:56d7",
-      "mac": "00:1b:24:e0:56:d7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-68.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/28",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:e0:56:d8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-68-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.68",
-      "ip6": null,
-      "mac": "00:1b:24:e0:57:d2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-68-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-68"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
deleted file mode 100755
index 1a8574dc1efbce394aa519cb6eaaa3d0583bd596..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-69.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "06/25/2008",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B26"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0BD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.69",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f9:f7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-69.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/29",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f9:f8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-69-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.69",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:d4",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-69-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-69"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
deleted file mode 100755
index 1d51470f6a837af56028c2d89a2c97ae60ebd56b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-7.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.7",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:d2:ef:38",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-7.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/7",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ef:39",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-7-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.7",
-      "ip6": null,
-      "mac": "00:16:36:df:0a:6e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-7-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-7"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
deleted file mode 100755
index 461ed75e5574284b76486c2e63242b30fd81d2b2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-70.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.70",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:b6:23",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-70.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/30",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b6:24",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-70-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.70",
-      "ip6": null,
-      "mac": "00:1b:24:2d:bf:ef",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-70-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-70"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
deleted file mode 100755
index ba32a7f791558159ff5ecd821df25b1418711f00..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-71.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT063"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.71",
-      "ip6": "fe80::21b:24ff:fe2d:f8a7",
-      "mac": "00:1b:24:2d:f8:a7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-71.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/31",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:a8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-71-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.71",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:55",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-71-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-71"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
deleted file mode 100755
index 4002e516bf2710b6d0d3654c7aa69a14cedda66f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-72.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.72",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:b8:97",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-72.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/32",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b8:98",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-72-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.72",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:3d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-72-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-72"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
deleted file mode 100755
index 223d0d6897d9376854f1e5f492cbbdeac0ff7ea2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-73.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT041"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.73",
-      "ip6": "fe80::21b:24ff:fe2d:b6ff",
-      "mac": "00:1b:24:2d:b6:ff",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-73.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/33",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b7:00",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-73-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.73",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:4e",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-73-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-73"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
deleted file mode 100755
index 940d058b735827e674779cd195a7886ec03038ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-74.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "02/04/2009",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B27"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.74",
-      "ip6": "fe80::216:36ff:feff:d602",
-      "mac": "00:16:36:ff:d6:02",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-74.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/34",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:ff:d6:03",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-74-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.74",
-      "ip6": null,
-      "mac": "00:16:36:ff:d9:be",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-74-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-74"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
deleted file mode 100755
index ff1e179c16b0b465594d4fa1b65aebd79e209c46..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-75.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.75",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:eb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-75.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/35",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:ec",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-75-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.75",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:e1",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-75-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-75"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
deleted file mode 100755
index b15f45c13b0605cba6e829e856eb5ee2b848fdf2..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-76.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT0D1"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.76",
-      "ip6": "fe80::21b:24ff:fe2d:b917",
-      "mac": "00:1b:24:2d:b9:17",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-76.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/36",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b9:18",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-76-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.76",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:fc",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-76-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-76"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
deleted file mode 100755
index 8be71f4131e7136e5523429fe382dcb79cf759d7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-77.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.77",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:b7:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-77.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/37",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b7:1c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-77-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.77",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:55",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-77-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-77"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
deleted file mode 100755
index 8c02cd00505011b4416a43654d7da8a5dad90d94..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-78.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.78",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:b3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-78.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/38",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:b4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-78-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.78",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fd:22",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-78-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-78"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
deleted file mode 100755
index 7d5d9fdfa57cb33dc33045e24c24f2a2bd91cefd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-79.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0711QBT0D2"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.79",
-      "ip6": "fe80::216:36ff:fed2:ee2c",
-      "mac": "00:16:36:d2:ee:2c",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-79.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/39",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:ee:2d",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-79-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.79",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:8d",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-79-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-79"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
deleted file mode 100755
index d74ea9a926c9cf54d6de761cf55186c3e5cd0965..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-8.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT09D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.8",
-      "ip6": "fe80::216:36ff:fee0:78b2",
-      "mac": "00:16:36:e0:78:b2",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-8.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/8",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:78:b3",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-8-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.8",
-      "ip6": null,
-      "mac": "00:16:36:e0:8b:d2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-8-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-8"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
deleted file mode 100755
index ccd85edcad97d99906ced4f667ab8d87eb952142..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-80.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.80",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e7:77:6d",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-80.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet4/40",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e7:77:6e",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-80-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.80",
-      "ip6": null,
-      "mac": "00:16:36:e7:80:80",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-80-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-80"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
deleted file mode 100644
index 264d6a161364d66798535fd24f1f654cdc8bf49a..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-81.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT093"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.81",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f8:2f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-81.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/1",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:30",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-81-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.81",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-81-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-81"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
deleted file mode 100644
index a6832ce74e7e7e40fe590ef543ba7f170772e3fe..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-82.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT03F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.82",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:43",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-82.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/2",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:44",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-82-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.82",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-82-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-82"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
deleted file mode 100644
index 344b6b1ba49b46c3c8d6f27979db8c742ec2b1a1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-83.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT08F"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.83",
-      "ip6": "fe80::21b:24ff:fe2d:f8a3",
-      "mac": "00:1b:24:2d:f8:a3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-83.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/3",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-83-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.83",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:54",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-83-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-83"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
deleted file mode 100644
index ea478ecdca983a31c0c1b9b8f2d377504e59d3d3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-84.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.84",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:09:3d:12:80:91",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-84.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/4",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-84-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.84",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-84-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-84"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
deleted file mode 100644
index 10a22f779402a74df115c7575c6c7030cbeddf47..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-85.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT07E"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.85",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:76:40:e3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-85.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/5",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:76:40:e4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-85-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.85",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-85-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-85"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
deleted file mode 100644
index 51f78dfb8e3bc3b4754a692cf0e31acc01aa2e03..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-86.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT086"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.86",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:bb",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-86.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/6",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:bc",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-86-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.86",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-86-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-86"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
deleted file mode 100644
index ca9bbe8f6c369fd495cec2f127ee30e8eceedcce..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-87.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0C8"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.87",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:78:9a",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-87.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/7",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:fa:a4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-87-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.87",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-87-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-87"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
deleted file mode 100644
index 028da187409b2452bf4d1b7f4198ab4b16c1663c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-88.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0722QBT063"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.88",
-      "ip6": "fe80::21b:24ff:fe2d:b7d3",
-      "mac": "00:1b:24:2d:b7:d3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-88.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/8",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:b7:d4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-88-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.88",
-      "ip6": null,
-      "mac": "00:1b:24:2d:c0:ab",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-88-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-88"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
deleted file mode 100644
index a79fdb456dc0cf117953fdfb3e326860502aa21f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-89.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT0BC"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.89",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f6:1b",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-89.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/9",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f6:1c",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-89-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.89",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-89-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-89"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
deleted file mode 100755
index c859675589c2f372a4ecc75db442f0c1fe338560..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-9.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "xxxxxxxxxx"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.9",
-      "ip6": "fe80::216:36ff:fe76:52ab",
-      "mac": "00:16:36:76:52:ab",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-9.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "r4",
-      "switch_port": "GigabitEthernet1/9",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:76:52:ac",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-9-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.9",
-      "ip6": null,
-      "mac": "00:16:36:76:56:c5",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-9-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-9"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
deleted file mode 100644
index f598e70c6fc0c6e938811d7c5a1a006a9ca771f5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-90.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT08C"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.90",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:87",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-90.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/10",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:88",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-90-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.90",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-90-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-90"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
deleted file mode 100644
index be624b902fa3446fc443a4edb92e89c4ec442dfe..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-91.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT075"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.91",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f5:f3",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-91.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/11",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:f4",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-91-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.91",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-91-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-91"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
deleted file mode 100644
index bdd15988261fa747ccea426a19725f5b128d87da..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-92.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT07B"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.92",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:3d:c9:d9",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-92.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/12",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:3d:c9:da",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-92-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.92",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-92-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-92"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
deleted file mode 100644
index 7ecd21189a60fa810349db18a9f533cd9f9ed89d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-93.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0AD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.93",
-      "ip6": "fe80::216:36ff:fed2:f3f0",
-      "mac": "00:16:36:d2:f3:f0",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-93.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/13",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:d2:f3:f1",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-93-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.93",
-      "ip6": null,
-      "mac": "00:16:36:d2:f8:6b",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-93-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-93"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
deleted file mode 100644
index b28fa4af05b31080beb9da71d634a6109967fbf7..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-94.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT08B"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.94",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f5:e7",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-94.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/14",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f5:e8",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-94-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.94",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-94-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-94"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
deleted file mode 100644
index acf58229c3e32dad93af0c51cf4fd8c6493bec61..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-95.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0DE"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.95",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:7f:d6",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-95.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/15",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:7f:d7",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-95-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.95",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-95-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-95"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
deleted file mode 100644
index af691dd03ae7f23f0633e78b645e1759992215ed..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-96.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT066"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.96",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:ff",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-96.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/16",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:00",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-96-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.96",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-96-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-96"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
deleted file mode 100644
index c9c7cdc6a6561da702e4bda35eec91b590822450..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-97.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT08E"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.97",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:1b:24:2d:f7:83",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-97.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/17",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f7:84",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-97-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.97",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-97-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-97"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
deleted file mode 100644
index f9f7f34b057bc92c3fa9039aa3e942a4416b9d6e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-98.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0712QBT0DD"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.98",
-      "ip6": "fe80::21b:24ff:fe2d:faa3",
-      "mac": "00:16:36:e0:7f:22",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-98.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/18",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:16:36:e0:7f:23",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-98-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.98",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fb:f8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-98-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-98"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json b/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
deleted file mode 100644
index 4fc3d9588d091f14fd5254b90c9361dd549d6d38..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/nodes/pastel-99.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-  "architecture": {
-    "platform_type": "x86_64",
-    "smp_size": 2,
-    "smt_size": 4
-  },
-  "bios": {
-    "release_date": "12/13/2006",
-    "vendor": "Sun Microsystems",
-    "version": "S39_3B13"
-  },
-  "chassis": {
-    "manufacturer": "Sun Microsystems",
-    "name": "Sun Fire X2200 M2",
-    "serial": "0723QBT06D"
-  },
-  "gpu": {
-    "gpu": false
-  },
-  "main_memory": {
-    "ram_size": 8588886016,
-    "virtual_size": null
-  },
-  "monitoring": {
-    "wattmeter": false
-  },
-  "network_adapters": [
-    {
-      "bridged": true,
-      "device": "eth0",
-      "driver": "forcedeth",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.16.112.99",
-      "ip6": "fe80::21b:24ff:fe2d:f89f",
-      "mac": "00:1b:24:2d:f8:9f",
-      "management": false,
-      "mountable": true,
-      "mounted": true,
-      "network_address": "pastel-99.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "gw-toulouse",
-      "switch_port": "GigabitEthernet2/19",
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "bridged": false,
-      "device": "eth1",
-      "driver": "forcedeth",
-      "enabled": false,
-      "interface": "Ethernet",
-      "mac": "00:1b:24:2d:f8:a0",
-      "management": false,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-99-eth1.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": null,
-      "vendor": "NVIDIA",
-      "version": "MCP55 Pro"
-    },
-    {
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.112.99",
-      "ip6": null,
-      "mac": "00:1b:24:2d:fc:53",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "pastel-99-bmc.toulouse.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "<unknown>",
-      "vendor": "Broadcom",
-      "version": "BCM5715c"
-    }
-  ],
-  "operating_system": {
-    "kernel": "3.2.0-4-amd64",
-    "name": "debian",
-    "release": "Wheezy",
-    "version": "7"
-  },
-  "performance": {
-    "core_flops": 4463000000.0,
-    "node_flops": 17370000000.0
-  },
-  "processor": {
-    "cache_l1": null,
-    "cache_l1d": 65536,
-    "cache_l1i": 65536,
-    "cache_l2": 1048576,
-    "cache_l3": 0,
-    "clock_speed": 2600000000,
-    "instruction_set": "x86-64",
-    "model": "AMD Opteron",
-    "other_description": "Dual-Core AMD Opteron(tm) Processor 2218",
-    "vendor": "AMD",
-    "version": 2218
-  },
-  "storage_devices": [
-    {
-      "device": "sda",
-      "driver": "sata_nv",
-      "interface": "SATA",
-      "model": "HITACHI HDS7225S",
-      "rev": "V5DO",
-      "size": 250056000000,
-      "storage": "HDD",
-      "vendor": "Hitachi"
-    }
-  ],
-  "supported_job_types": {
-    "besteffort": true,
-    "deploy": true,
-    "virtual": "amd-v"
-  },
-  "type": "node",
-  "uid": "pastel-99"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json b/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
deleted file mode 100755
index bb0c040b337bfd85c01f689286328eecea37af6d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/clusters/pastel/pastel.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "created_at": "Wed, 28 Nov 2007 23:00:00 GMT",
-  "kavlan": true,
-  "model": "Sun Fire X2200 M2",
-  "production": true,
-  "type": "cluster",
-  "uid": "pastel"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json
deleted file mode 120000
index 30b0a480400b40905271d51043768003e62cde82..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.0.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.0.json
deleted file mode 120000
index 4237de0a7b36639570c43f50c38ec24eb5133603..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.1.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.1.json
deleted file mode 120000
index c5b51d7c9d54e88d9120f7c71e135189c73d2c42..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.2.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.2.json
deleted file mode 120000
index c0869933b95e0d1c2e649c85b86a198b779d07e3..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.3.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.3.json
deleted file mode 120000
index b9f85db57283899c867448460c6137e39434aa05..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.4.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.4.json
deleted file mode 120000
index b0289442e2a0448b08dcc926d53a838043404635..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.5.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.5.json
deleted file mode 120000
index a06e6ffc7de99174849b3360f93d250a5149e237..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.6.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.6.json
deleted file mode 120000
index 3fe1a3b68da7569755d9f0b3f93408d6cbe7d933..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.7.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.7.json
deleted file mode 120000
index 93b532e03d2c35fd4eb98d3ff3b037b052066724..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.8.json
deleted file mode 120000
index e0f02f1e05bb331899977c8cb516baf3a30e5b58..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-base-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json
deleted file mode 120000
index f651be05618dcb7f2b8a6e1a53624a164aef6984..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.9.json
deleted file mode 120000
index cfeca0cdca6e6b6754f27d2799f1730047c7b319..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.0.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.0.json
deleted file mode 120000
index ea1e939fffd7e68d62d8fedd3a052347e68e5bad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.1.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.1.json
deleted file mode 120000
index 54b3c74abfe130d3674dae6c493123384bd20f38..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.10.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.10.json
deleted file mode 120000
index c48dbba880bf44c76e40d068afb536adb4fb8d3e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.10.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.2.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.2.json
deleted file mode 120000
index 8335a58e18c2d19ff5a27a6aefee7037ccafaf0e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.3.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.3.json
deleted file mode 120000
index facc299c50594acede751012f5560cf568cf2488..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.4.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.4.json
deleted file mode 120000
index 6b40f32a0c47c9e287611f9e26a3fbbf9ba4a49b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.5.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.5.json
deleted file mode 120000
index b0297bfe76de44920dc7c136008f1d2117b26b28..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.6.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.6.json
deleted file mode 120000
index 3afe03a17af18798ab80b45b87557362f5ea9c12..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.7.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.7.json
deleted file mode 120000
index 643bce3bfcf1dc3e5a4464dd0361089a824b1d95..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.8.json
deleted file mode 120000
index ea75ed20751c58f17d0f7507d23015a5485753c5..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.9.json
deleted file mode 120000
index 7f2e7f23e7638b6b78e5412acd246f69ce2aca0b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-1.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-big-1.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json
deleted file mode 120000
index 9006de5d2a4ceeebc8b7382fe52c6825a260994f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.0.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.0.json
deleted file mode 120000
index c87cea7f14fa10e76b3a2de2b5deb958083c1321..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.1.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.1.json
deleted file mode 120000
index 24b4e86fffcad3f408e207026940b4d8c7d9d7d8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.10.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.10.json
deleted file mode 120000
index 45372dc35ebae6f2b22465e007b594ffb1445965..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.10.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.2.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.2.json
deleted file mode 120000
index 1385dfd20c460dfbb487a50c648a3117d912c538..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.3.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.3.json
deleted file mode 120000
index 247ef61ddaddeeb3a1fb726baa43e58780637c6c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.4.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.4.json
deleted file mode 120000
index f12ccbc39592160339ae4690cfc1dc1cd38cef76..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.5.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.5.json
deleted file mode 120000
index 1db75e4e157bb69e6f4be73ebd9a3e478221a271..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.6.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.6.json
deleted file mode 120000
index 6996278c81da5effe01fd26a4c2ca17b33c6b1ca..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.7.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.7.json
deleted file mode 120000
index 66896fe23346352c5e08b85e15540700b789d2b4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.8.json
deleted file mode 120000
index 7c5671dad4e51e2322d53e4683d6b2c06d6aedd4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json
deleted file mode 120000
index 19169ec19f78fc93fa1b96da3d43ac757ab705a1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-1.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-min-1.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json
deleted file mode 120000
index 5185a0bb1ddf7c35393027250bf6959b6fd4dee8..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.9.json
deleted file mode 120000
index 75296a51cd62ef3921db8646b8a980cd557ae577..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.0.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.0.json
deleted file mode 120000
index d2665f4301f9b546a1e29721d7ea665a9a8cb54d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.1.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.1.json
deleted file mode 120000
index 26db54f58511478ba0eefa5a24b95b596c7c2e09..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.10.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.10.json
deleted file mode 120000
index 0e785d83b16b32cf4185b4dfd779ab7df7c55bad..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.10.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.10.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.2.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.2.json
deleted file mode 120000
index 3cc8c5b46080d084846d09d1fe7862ff57e756c4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.3.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.3.json
deleted file mode 120000
index c6f1d46a09e4ea069d5d2736ea7e0346f4d25289..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.4.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.4.json
deleted file mode 120000
index 31cb91da4c8504ac8a133945eb61f56e14e2d22b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.5.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.5.json
deleted file mode 120000
index dfa2d1e3fc93fb6c1410456afc7bb9c242beae73..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.6.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.6.json
deleted file mode 120000
index a5f2990f4434a84b28605f8cc821d36a2028ad11..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.7.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.7.json
deleted file mode 120000
index 2e63ea6c05084cbdf35152301c553a4eb95c3977..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.8.json
deleted file mode 120000
index 42e41ccf94a84e178c01e77d049452d70a888c87..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.9.json
deleted file mode 120000
index 8adc74166423c2ac1d03dad27e87c7724e4f5ec9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-1.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-nfs-1.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json
deleted file mode 120000
index 1812b44b1faddbc83cdeade8c1b7939e9b0918ae..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.9.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.9.json
deleted file mode 120000
index 4ef8eafce3171af7fa5a3309f882475b1700425b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.9.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-0.9.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.0.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.0.json
deleted file mode 120000
index ba6b153d7b070169707bb25b1eb25928ef9193fc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.1.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.1.json
deleted file mode 120000
index 9215a5e98a51bc31ebc302bbed37e55ced164eec..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.2.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.2.json
deleted file mode 120000
index 109c625ea91985748cfcbc2a0ddf7ac13e6182eb..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.3.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.3.json
deleted file mode 120000
index 60a88db88efb096c50e9874773defffcc7c37a32..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.4.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.4.json
deleted file mode 120000
index 996fdd9858f5877634968cd57bdd3dc3e89de016..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.5.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.5.json
deleted file mode 120000
index 07735094ac8f0e3be622f5d887d54c0bc1747714..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.5.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.5.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.6.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.6.json
deleted file mode 120000
index 88e1c96af55e5ea49719f1dd953fdea6df97ece1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.6.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.6.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.7.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.7.json
deleted file mode 120000
index 9436b6c25a2b02834e53dbbb1cbaf1716aaa2bf4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.7.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.7.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.8.json
deleted file mode 120000
index 53b9615a7c173c42badbfeffb7a5d55d6d22163b..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-1.8.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/squeeze-x64-xen-1.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-0.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-base-0.4.json
deleted file mode 120000
index ab33c013dee2a9b09e5e59e1fd60ffb84f854e11..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.0.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.0.json
deleted file mode 120000
index a0f49aad0f07a81f1f9e6c2caeb34a022280ed3c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.1.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.1.json
deleted file mode 120000
index b05150cbc486c121e7a6fe1f8f15bad1f7e97a2c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.2.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.2.json
deleted file mode 120000
index c729914ce88d5d667e5a71edcb412ab09d61eadc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.3.json
deleted file mode 120000
index 3fd75f327362d2f286fdb42d243bbd1cf66811ca..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-base-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-base-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-0.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-big-0.4.json
deleted file mode 120000
index f68e26d86e8843f21db1d5046c683f015984e618..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.0.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.0.json
deleted file mode 120000
index a70a8e31d03f7c68d546aefb153bd4b8837e9f5c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.1.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.1.json
deleted file mode 120000
index 96227166e75094dc717ef004dc668f643da2cd73..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.2.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.2.json
deleted file mode 120000
index 6ca4c0a55b2a1b0d2c10497a4b1730de05e300ba..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.3.json
deleted file mode 120000
index ea4b4aa57619ed137413bfc418c0156c9bf37155..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-big-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-big-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-0.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-0.4.json
deleted file mode 120000
index 18b7f38686658a9787a1656f4f1f9e11c98114d1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.0.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.0.json
deleted file mode 120000
index cbff65a13fde80d2d275993f80ab342c828b7abd..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.1.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.1.json
deleted file mode 120000
index 04e2901084eb0123cbb7aab32f7da335f7ac7665..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.2.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.2.json
deleted file mode 120000
index 8eb9f951944fba171914ce9672df43301f0b7a36..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json
deleted file mode 120000
index 9e293e2b9c4221a16ecb9dc66414579ea5b11b0d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
deleted file mode 120000
index 29aa77b8b72a0c2b3de57351b9f9d5f7dc293d9c..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-min-1.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-min-1.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-0.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-0.4.json
deleted file mode 120000
index 0922998b03025cc207e6604d22ef2d36430bc6a1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.0.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.0.json
deleted file mode 120000
index 29cd14904d401b0fd45c0672fa365930afcc15d9..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.1.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.1.json
deleted file mode 120000
index cc41493ccfc1f88e440abe7ea633964a84bd2f83..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.2.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.2.json
deleted file mode 120000
index 2f1acf3438acbc7bee3187c059d9fe6de0055d10..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.3.json
deleted file mode 120000
index 97c6137286cb558f85ceba5b329b16375cd2a2b1..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-nfs-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-nfs-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-0.4.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-0.4.json
deleted file mode 120000
index d6df651aae17cb44a5b0781d150e2b7092c4ef26..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-0.4.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-0.4.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.0.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.0.json
deleted file mode 120000
index fb8c4e7c352ecf85449ecc46daae929b1297a79d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.1.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.1.json
deleted file mode 120000
index 4e74cde4c3d2a134d4c37b630455986c52dd52a4..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.2.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.2.json
deleted file mode 120000
index e414204da7aaf6792720ddde0074d1ef82ccc12d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.2.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.2.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.3.json b/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.3.json
deleted file mode 120000
index c843ebd19863f0edab5f42c78ce7b7942781444f..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/wheezy-x64-xen-1.3.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/wheezy-x64-xen-1.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
deleted file mode 100644
index 16388dd91c805856fb290a8c72f30cd03a9c5c78..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json
+++ /dev/null
@@ -1,447 +0,0 @@
-{
-  "backplane_bps": 2000000000000,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "router",
-  "linecards": [
-    {
-
-    },
-    {
-      "backplane_bps": 80000000000,
-      "kind": "virtual",
-      "naming_pattern": "Te%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "renater-toulouse"
-        },
-        {
-          "kind": "switch",
-          "uid": "r4"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "backplane_bps": 80000000000,
-      "kind": "node",
-      "naming_pattern": "Gi%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "pastel-81"
-        },
-        {
-          "uid": "pastel-82"
-        },
-        {
-          "uid": "pastel-83"
-        },
-        {
-          "uid": "pastel-84"
-        },
-        {
-          "uid": "pastel-85"
-        },
-        {
-          "uid": "pastel-86"
-        },
-        {
-          "uid": "pastel-87"
-        },
-        {
-          "uid": "pastel-88"
-        },
-        {
-          "uid": "pastel-89"
-        },
-        {
-          "uid": "pastel-90"
-        },
-        {
-          "uid": "pastel-91"
-        },
-        {
-          "uid": "pastel-92"
-        },
-        {
-          "uid": "pastel-93"
-        },
-        {
-          "uid": "pastel-94"
-        },
-        {
-          "uid": "pastel-95"
-        },
-        {
-          "uid": "pastel-96"
-        },
-        {
-          "uid": "pastel-97"
-        },
-        {
-          "uid": "pastel-98"
-        },
-        {
-          "uid": "pastel-99"
-        },
-        {
-          "uid": "pastel-100"
-        },
-        {
-          "uid": "pastel-121"
-        },
-        {
-          "uid": "pastel-122"
-        },
-        {
-          "uid": "pastel-123"
-        },
-        {
-          "uid": "pastel-124"
-        },
-        {
-          "uid": "pastel-125"
-        },
-        {
-          "uid": "pastel-126"
-        },
-        {
-          "uid": "pastel-127"
-        },
-        {
-          "uid": "pastel-128"
-        },
-        {
-          "uid": "pastel-129"
-        },
-        {
-          "uid": "pastel-101"
-        },
-        {
-          "uid": "pastel-102"
-        },
-        {
-          "uid": "pastel-103"
-        },
-        {
-          "uid": "pastel-104"
-        },
-        {
-          "uid": "pastel-105"
-        },
-        {
-          "uid": "pastel-106"
-        },
-        {
-          "uid": "pastel-107"
-        },
-        {
-          "uid": "pastel-108"
-        },
-        {
-          "uid": "pastel-109"
-        },
-        {
-          "uid": "pastel-110"
-        },
-        {
-          "uid": "pastel-111"
-        },
-        {
-          "uid": "pastel-112"
-        },
-        {
-          "uid": "pastel-113"
-        },
-        {
-          "uid": "pastel-114"
-        },
-        {
-          "uid": "pastel-115"
-        },
-        {
-          "uid": "pastel-116"
-        },
-        {
-          "uid": "pastel-117"
-        },
-        {
-          "uid": "pastel-118"
-        },
-        {
-          "uid": "pastel-119"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "backplane_bps": 80000000000,
-      "kind": "node",
-      "naming_pattern": "Gi%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "pastel-120"
-        },
-        {
-          "uid": "pastel-130"
-        },
-        {
-          "uid": "pastel-131"
-        },
-        {
-          "uid": "pastel-132"
-        },
-        {
-          "uid": "pastel-133"
-        },
-        {
-          "uid": "pastel-134"
-        },
-        {
-          "uid": "pastel-135"
-        },
-        {
-          "uid": "pastel-136"
-        },
-        {
-          "uid": "pastel-137"
-        },
-        {
-          "uid": "pastel-138"
-        },
-        {
-          "uid": "pastel-139"
-        },
-        {
-          "uid": "pastel-140"
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-          "kind": "switch",
-          "uid": "CICT"
-        },
-        {
-          "kind": "switch",
-          "port": "bmc",
-          "uid": "spastel1-ipmi"
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-
-        },
-        {
-          "kind": "other",
-          "uid": "g5kservices2"
-        },
-        {
-          "kind": "other",
-          "uid": "g5kservices3"
-        },
-        {
-          "kind": "other",
-          "uid": "g5kservices1"
-        },
-        {
-          "kind": "other",
-          "uid": "nfs-g5k"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Cisco WS-C6506-E",
-  "mtu": 9216,
-  "routes": {
-
-  },
-  "site": "toulouse",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "gw-toulouse",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "snmp_pattern": "Vlan%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.127.254"
-      ],
-      "administrative": true
-    },
-    "vlan101": {
-      "addresses": [
-        "172.17.127.254"
-      ]
-    },
-    "vlan103": {
-      "addresses": [
-        "192.168.69.1"
-      ]
-    },
-    "vlan500": {
-      "addresses": [
-        "192.168.4.16"
-      ]
-    },
-    "vlan701": {
-      "addresses": [
-        "192.168.192.0/20"
-      ],
-      "name": "kavlan-1"
-    },
-    "vlan702": {
-      "addresses": [
-        "192.168.208.0/20"
-      ],
-      "name": "kavlan-2"
-    },
-    "vlan703": {
-      "addresses": [
-        "192.168.224.0/20"
-      ],
-      "name": "kavlan-3"
-    },
-    "vlan704": {
-      "addresses": [
-        "10.28.0.0/18"
-      ],
-      "name": "kavlan-4"
-    },
-    "vlan705": {
-      "addresses": [
-        "10.28.64.0/18"
-      ],
-      "name": "kavlan-5"
-    },
-    "vlan706": {
-      "addresses": [
-        "10.28.128.0/18"
-      ],
-      "name": "kavlan-6"
-    },
-    "vlan707": {
-      "addresses": [
-        "10.28.192.0/18"
-      ],
-      "name": "kavlan-7"
-    },
-    "vlan708": {
-      "addresses": [
-        "10.29.0.0/18"
-      ],
-      "name": "kavlan-8"
-    },
-    "vlan709": {
-      "addresses": [
-        "10.29.64.0/18"
-      ],
-      "name": "kavlan-9"
-    },
-    "vlan717": {
-      "addresses": [
-        "10.31.192.0/18"
-      ],
-      "name": "kavlan-17"
-    }
-  },
-  "weathermap": {
-
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/network_equipments/r4.json b/data/grid5000/sites/toulouse/network_equipments/r4.json
deleted file mode 100644
index 8407e883932e65b13fc34f50afb57e566c55f18d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/network_equipments/r4.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
-  "backplane_bps": 480000000000,
-  "channels": {
-    "naming_pattern": "Po%CHANNELID%"
-  },
-  "kind": "switch",
-  "linecards": [
-    {
-
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kind": "node",
-      "naming_pattern": "Gi%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "pastel-1"
-        },
-        {
-          "uid": "pastel-2"
-        },
-        {
-          "uid": "pastel-3"
-        },
-        {
-          "uid": "pastel-4"
-        },
-        {
-          "uid": "pastel-5"
-        },
-        {
-          "uid": "pastel-6"
-        },
-        {
-          "uid": "pastel-7"
-        },
-        {
-          "uid": "pastel-8"
-        },
-        {
-          "uid": "pastel-9"
-        },
-        {
-          "uid": "pastel-10"
-        },
-        {
-          "uid": "pastel-11"
-        },
-        {
-          "uid": "pastel-12"
-        },
-        {
-          "uid": "pastel-13"
-        },
-        {
-          "uid": "pastel-14"
-        },
-        {
-          "uid": "pastel-15"
-        },
-        {
-          "uid": "pastel-16"
-        },
-        {
-          "uid": "pastel-17"
-        },
-        {
-          "uid": "pastel-18"
-        },
-        {
-          "uid": "pastel-19"
-        },
-        {
-          "uid": "pastel-20"
-        },
-        {
-          "uid": "pastel-21"
-        },
-        {
-          "uid": "pastel-22"
-        },
-        {
-          "uid": "pastel-23"
-        },
-        {
-          "uid": "pastel-24"
-        },
-        {
-          "uid": "pastel-25"
-        },
-        {
-          "uid": "pastel-26"
-        },
-        {
-          "uid": "pastel-27"
-        },
-        {
-          "uid": "pastel-28"
-        },
-        {
-          "uid": "pastel-29"
-        },
-        {
-          "uid": "pastel-30"
-        },
-        {
-          "uid": "pastel-31"
-        },
-        {
-          "uid": "pastel-32"
-        },
-        {
-          "uid": "pastel-33"
-        },
-        {
-          "uid": "pastel-34"
-        },
-        {
-          "uid": "pastel-36"
-        },
-        {
-          "uid": "pastel-37"
-        },
-        {
-          "uid": "pastel-35"
-        },
-        {
-          "uid": "pastel-38"
-        },
-        {
-          "uid": "pastel-39"
-        },
-        {
-          "uid": "pastel-40"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kind": "router",
-      "naming_pattern": "Te%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "gw-toulouse"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-
-    },
-    {
-      "backplane_bps": 40000000000,
-      "kind": "node",
-      "naming_pattern": "Gi%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-          "uid": "pastel-41"
-        },
-        {
-          "uid": "pastel-42"
-        },
-        {
-          "uid": "pastel-43"
-        },
-        {
-          "uid": "pastel-44"
-        },
-        {
-          "uid": "pastel-45"
-        },
-        {
-          "uid": "pastel-46"
-        },
-        {
-          "uid": "pastel-47"
-        },
-        {
-          "uid": "pastel-48"
-        },
-        {
-          "uid": "pastel-49"
-        },
-        {
-          "uid": "pastel-50"
-        },
-        {
-          "uid": "pastel-51"
-        },
-        {
-          "uid": "pastel-52"
-        },
-        {
-          "uid": "pastel-53"
-        },
-        {
-          "uid": "pastel-54"
-        },
-        {
-          "uid": "pastel-55"
-        },
-        {
-          "uid": "pastel-56"
-        },
-        {
-          "uid": "pastel-57"
-        },
-        {
-          "uid": "pastel-58"
-        },
-        {
-          "uid": "pastel-59"
-        },
-        {
-          "uid": "pastel-60"
-        },
-        {
-          "uid": "pastel-61"
-        },
-        {
-          "uid": "pastel-62"
-        },
-        {
-          "uid": "pastel-63"
-        },
-        {
-          "uid": "pastel-64"
-        },
-        {
-          "uid": "pastel-65"
-        },
-        {
-          "uid": "pastel-66"
-        },
-        {
-          "uid": "pastel-67"
-        },
-        {
-          "uid": "pastel-68"
-        },
-        {
-          "uid": "pastel-69"
-        },
-        {
-          "uid": "pastel-70"
-        },
-        {
-          "uid": "pastel-71"
-        },
-        {
-          "uid": "pastel-72"
-        },
-        {
-          "uid": "pastel-73"
-        },
-        {
-          "uid": "pastel-74"
-        },
-        {
-          "uid": "pastel-75"
-        },
-        {
-          "uid": "pastel-76"
-        },
-        {
-          "uid": "pastel-77"
-        },
-        {
-          "uid": "pastel-78"
-        },
-        {
-          "uid": "pastel-79"
-        },
-        {
-          "uid": "pastel-80"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Cisco 7606",
-  "mtu": 9216,
-  "routes": {
-
-  },
-  "site": "toulouse",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "r4",
-  "vlans": {
-    "naming_pattern": "Vlan%VLANID%",
-    "snmp_pattern": "Vlan-%VLANID%",
-    "vlan100": {
-      "addresses": [
-        "172.16.127.201"
-      ],
-      "administrative": true
-    }
-  },
-  "weathermap": {
-
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
deleted file mode 100755
index e83f7ed681af1d4e2ad818fc819cf94d2e5664fc..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/toulouse.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilation_server": false,
-  "description": "Toulouse Grid'5000 Site",
-  "email_contact": "support-staff@lists.grid5000.fr",
-  "kavlan_ip_range": "10.28.0.0/14",
-  "latitude": 43.6167,
-  "location": "Toulouse, France",
-  "longitude": 1.4333,
-  "name": "Toulouse",
-  "production": true,
-  "security_contact": "support-staff@lists.grid5000.fr",
-  "storage5k": false,
-  "sys_admin_contact": "support-staff@lists.grid5000.fr",
-  "type": "site",
-  "uid": "toulouse",
-  "user_support_contact": "support-staff@lists.grid5000.fr",
-  "virt_ip_range": "10.160.0.0/14",
-  "web": "https://www.grid5000.fr/mediawiki/index.php/Toulouse:Home"
-}
\ No newline at end of file
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-1.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-1.yaml
deleted file mode 100644
index 7998f369b4a6de253d99b73ed2413dce3ebf999d..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-1.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-1:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8e:3e
-      ip: 172.17.112.1
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:82:92
-      ip6: fe80::216:36ff:fee0:8292
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.1
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:82:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0711QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-10.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-10.yaml
deleted file mode 100644
index fb74759c1ad15a1e4f4e5d3dd704617d7d2bf597..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-10.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-10:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8e:8d
-      ip: 172.17.112.10
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:80:1a
-      ip6: fe80::216:36ff:fee0:801a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.10
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:80:1b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0711QBT0D8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-100.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-100.yaml
deleted file mode 100644
index a85be9ed9ed2617b48c5298920f7b54c4acc087e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-100.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-100:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:e7
-      ip: 172.17.112.100
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:ff
-      ip6: fe80::21b:24ff:fe2d:f6ff
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.100
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:00
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT03C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-101.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-101.yaml
deleted file mode 100644
index c36198c355228b75216154d025f52d4a23224478..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-101.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-101:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:c0:9f:00:00:01
-      ip: 172.17.112.101
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:9b
-      ip6: fe80::21b:24ff:fe2d:f89b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.101
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:9c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT06C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-102.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-102.yaml
deleted file mode 100644
index e414fed74778f00b4f4642da18a28ec1d906321a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-102.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-102:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:56
-      ip: 172.17.112.102
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b7:1f
-      ip6: fe80::21b:24ff:fe2d:b71f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.102
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b7:20
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0722QBT0C6
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-103.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-103.yaml
deleted file mode 100644
index 8ed01404fdb486dca8c17661160eb3880ab9439c..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-103.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-103:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:bf:ea
-      ip: 172.17.112.103
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b6:0f
-      ip6: fe80::21b:24ff:fe2d:b60f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.103
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b6:10
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: SEAGATE ST32502N
-      device: sda
-      size: 250056000000
-      rev: n/a
-      vendor: Seagate
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0722QBT067
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-104.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-104.yaml
deleted file mode 100644
index 1767f47bf7f55db8d22e1638aa8e7437f983496f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-104.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-104:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:e6
-      ip: 172.17.112.104
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:79:02
-      ip6: fe80::216:36ff:fee0:7902
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.104
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:79:03
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT098
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-105.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-105.yaml
deleted file mode 100644
index 4b982cea270ceafb2fbb6d3935bdf64fa7065c77..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-105.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-105:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:b3
-      ip: 172.17.112.105
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f9:7b
-      ip6: fe80::21b:24ff:fe2d:f97b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.105
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f9:7c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT085
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-106.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-106.yaml
deleted file mode 100644
index 9b55b562bc4436dac54e711fdb632f7690b1a41a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-106.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-106:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:9a
-      ip: 172.17.112.106
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:b7
-      ip6: fe80::21b:24ff:fe2d:f7b7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.106
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:b8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT064
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-107.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-107.yaml
deleted file mode 100644
index 1429eadaa90fe6896d74073771da1f1289082061..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-107.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-107:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:60
-      ip: 172.17.112.107
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:33
-      ip6: fe80::21b:24ff:fe2d:f833
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.107
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:34
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0723QBT097
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-108.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-108.yaml
deleted file mode 100644
index b37c30f0c82407def217f5255b7cc5e5dd3e5c3f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-108.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-108:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:2c
-      ip: 172.17.112.108
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:eb
-      ip6: fe80::21b:24ff:fe2d:f5eb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.108
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT08D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-109.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-109.yaml
deleted file mode 100644
index 445e5a30a1c80baeefb7eb81a8fa60d466f84429..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-109.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-109:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:79
-      ip: 172.17.112.109
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:f7
-      ip6: fe80::21b:24ff:fe2d:f7f7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.109
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT07D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-11.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-11.yaml
deleted file mode 100644
index 55f599fd068a61fc7a2f02651e0c9ce53e760ff5..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-11.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-11:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:99
-      ip: 172.17.112.11
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ef:48
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.11
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ef:49
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-110.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-110.yaml
deleted file mode 100644
index a15ca611df554ac58e2e16fa4ca84e438b44e7e4..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-110.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-110:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8f:2d
-      ip: 172.17.112.110
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:84:8e
-      ip6: fe80::216:36ff:fee0:848e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.110
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:84:8f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0711QBT0CD
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-111.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-111.yaml
deleted file mode 100644
index e9463845678a6e86cc177ff543f8300e7c7a052a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-111.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-111:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:48
-      ip: 172.17.112.111
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:bb
-      ip6: fe80::21b:24ff:fe2d:f5bb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.111
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:bc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT07A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-112.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-112.yaml
deleted file mode 100644
index 09859e87cd62663c18b3ddba15f66822ba356104..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-112.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-112:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:6a
-      ip: 172.17.112.112
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:e4
-      ip6: fe80::216:36ff:fed2:f3e4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.112
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:e5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0712QBT035
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-113.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-113.yaml
deleted file mode 100644
index c90baad5d269ae199f4704f914aeec7046caa156..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-113.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-113:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: SEAGATE ST32502N
-      device: sda
-      size: 250056000000
-      rev: n/a
-      vendor: Seagate
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:65
-      ip: 172.17.112.113
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:d4
-      ip6: fe80::216:36ff:fed2:f3d4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.113
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:d5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0712QBT039
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-114.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-114.yaml
deleted file mode 100644
index 98ec7aed10766b8760376698809e1a32d7f1ba80..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-114.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-114:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:6f
-      ip: 172.17.112.114
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:6b
-      ip6: fe80::21b:24ff:fe2d:f86b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.114
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:6c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT090
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-115.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-115.yaml
deleted file mode 100644
index 401793ead2f8f0999ea35db59879c4325aeeb523..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-115.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-115:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.115
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f4:10
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.115
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f4:11
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0A9
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-116.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-116.yaml
deleted file mode 100644
index 3d586d0d1e11803bf76b723c97be1df08f8c1e5c..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-116.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-116:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.116
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:af
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.116
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:b0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT06B 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-117.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-117.yaml
deleted file mode 100644
index 3830b1818245576130754751a3d6ac5c4dde464b..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-117.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-117:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.117
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b8:a7
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.117
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b8:a8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0722QBT0CF 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-118.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-118.yaml
deleted file mode 100644
index da2b844ceff4b51229a3f85fc421902cf80aae40..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-118.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-118:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.118
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:0b
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.118
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:0c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: SEAGATE ST32502N
-      device: sda
-      size: 250056000000
-      rev: n/a
-      vendor: Seagate
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT071 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-119.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-119.yaml
deleted file mode 100644
index 6e8e02856d6adfdfb4ee72088fbdcded13966af7..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-119.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-119:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:ee
-      ip: 172.17.112.119
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:fa:83
-      ip6: fe80::21b:24ff:fe2d:fa83
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.119
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0A6
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-12.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-12.yaml
deleted file mode 100644
index 74a39281fcf6968c7f6e18951d66d965a5e94c15..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-12.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-12:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:ec
-      ip: 172.17.112.12
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:13
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.12
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:14
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT065
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-120.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-120.yaml
deleted file mode 100644
index 1cac3b5c7b1d9c7b56695aab31d340c1e2e8ce60..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-120.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-120:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:09
-      ip: 172.17.112.120
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:87
-      ip6: fe80::21b:24ff:fe2d:f687
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.120
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT067
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-121.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-121.yaml
deleted file mode 100644
index e5cbe468e46cdca0081b94746acbd32eebcf079a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-121.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-121:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.121
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:3d:ca:a1
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.121
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-122.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-122.yaml
deleted file mode 100644
index 8e3c75acae949af40501bcdf4a4f5c964288f51a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-122.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-122:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:64
-      ip: 172.17.112.122
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:3b
-      ip6: fe80::21b:24ff:fe2d:f83b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.122
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT06A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-123.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-123.yaml
deleted file mode 100644
index 8684c9b3c3f97afbc2c21c8e984afed4ba7d7598..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-123.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-123:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.123
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:ff:d3:6e 
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.123
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:ff:d3:6f 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-124.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-124.yaml
deleted file mode 100644
index eb04ba83131f7c2867b1302a142948a4460f3c3b..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-124.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-124:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.124
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:2a
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.124
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:2b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT038 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-125.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-125.yaml
deleted file mode 100644
index 2adb69db2e9989412e03578c43466f60572aa187..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-125.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-125:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:ff:d9:7a
-      ip: 172.17.112.125
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:ff:d4:8a
-      ip6: fe80::216:36ff:feff:d48a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.125
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:ff:d4:8b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-126.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-126.yaml
deleted file mode 100644
index a957e1ca1f8ae3926230db991f6b054cda428a65..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-126.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-126:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.126
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:aa
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.126
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:ab
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT09C 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-127.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-127.yaml
deleted file mode 100644
index f0ac14b8b080c42eb5807ff5cde37ec88fa07706..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-127.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-127:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:3d:f6:29
-      ip: 172.17.112.127
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:3d:e5:41
-      ip6: fe80::21b:24ff:fe3d:e541
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.127
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:3d:e5:42
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-128.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-128.yaml
deleted file mode 100644
index a4316303cedab0aa0755e6e36490263014907336..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-128.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-128:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.128
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:ff:d3:ea
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.128
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-129.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-129.yaml
deleted file mode 100644
index b35f2596374c77a86db0de324c88a647032ef8fc..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-129.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-129:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.129
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:3d:e4:a5
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.129
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-13.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-13.yaml
deleted file mode 100644
index 28f77102915cc8258965da8406d91d53630452e8..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-13.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-13:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8c:16
-      ip: 172.17.112.13
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:79:c2
-      ip6: fe80::216:36ff:fee0:79c2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.13
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:79:c3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0712QBT0A0
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-130.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-130.yaml
deleted file mode 100644
index a1a29c965fd86128fa4a814f0319c4dc373caa24..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-130.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-130:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:ee
-      ip: 172.17.112.130
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:1b
-      ip6: fe80::21b:24ff:fe2d:f71b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.130
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:1c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT062
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-131.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-131.yaml
deleted file mode 100644
index 7693af8b6b6172ccdd0f9f7f65e1029972a2e870..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-131.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-131:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8f:d8
-      ip: 172.17.112.131
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:87:9a
-      ip6: fe80::216:36ff:fee0:879a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.131
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:87:9b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0DF
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-132.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-132.yaml
deleted file mode 100644
index 3c80acf3b3afc22335d89457d59f25a4fe6e3bad..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-132.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-132:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f6:ae
-      ip: 172.17.112.132
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f2:54
-      ip6: fe80::216:36ff:fed2:f254
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.132
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f2:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT02A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-133.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-133.yaml
deleted file mode 100644
index 6f3ee8024c09071f1ff4ef78ad2354c3c4759ef4..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-133.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-133:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:e4
-      ip: 172.17.112.133
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:f3
-      ip6: fe80::21b:24ff:fe2d:f6f3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.133
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0A1
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-134.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-134.yaml
deleted file mode 100644
index 20126cea020e66cb752ae1495c07dfda7ab35171..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-134.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-134:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:a4
-      ip: 172.17.112.134
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:df:08:c6
-      ip6: fe80::216:36ff:fedf:8c6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.134
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:df:08:c7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0710QBT02D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-135.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-135.yaml
deleted file mode 100644
index 54e3126186e295f8b4a258519dab90dcd70d755d..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-135.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-135:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:46
-      ip: 172.17.112.135
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f9:0f
-      ip6: fe80::21b:24ff:fe2d:f90f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.135
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f9:10
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT0A2
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-136.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-136.yaml
deleted file mode 100644
index b4b07113c6f75d769a48610ac63d4ad4568c1e03..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-136.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-136:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:4f
-      ip: 172.17.112.136
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:54
-      ip6: fe80::216:36ff:fed2:f354
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.136
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:55
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0710QBT02F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-137.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-137.yaml
deleted file mode 100644
index 90d42fced2c2da50b033b9713be4f7d2455bf8a4..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-137.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-137:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: SEAGATE ST32500N
-      device: sda
-      size: 250059350016
-      rev: n/a
-      vendor: Seagate
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:ff
-      ip: 172.17.112.137
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:79:66
-      ip6: fe80::216:36ff:fee0:7966
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.137
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:79:67
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0A4
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-138.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-138.yaml
deleted file mode 100644
index 41371d41f19693ffab870eccae5465fa7dd86f9d..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-138.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-138:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:de
-      ip: 172.17.112.138
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:df
-      ip6: fe80::21b:24ff:fe2d:f6df
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.138
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:e0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT078
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-139.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-139.yaml
deleted file mode 100644
index 3a9a798af2eb56b4e8d4ce8b8ee41e9fff97e128..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-139.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-139:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8f:67
-      ip: 172.17.112.139
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:85:b2
-      ip6: fe80::216:36ff:fee0:85b2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.139
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:85:b3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0711QBT0D4
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-14.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-14.yaml
deleted file mode 100644
index f00442b8100a8e909e7ce7c30ae79c553261f5a1..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-14.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-14:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:1c
-      ip: 172.17.112.14
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f1:c4
-      ip6: fe80::216:36ff:fed2:f1c4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.14
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f1:c5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0710QBT01F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-140.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-140.yaml
deleted file mode 100644
index 54b2118378b8d1a02636f8bceca3494d60d7b87e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-140.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-140:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: SEAGATE ST32502N
-      device: sda
-      size: 250056000000
-      rev: n/a
-      vendor: Seagate
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:7c
-      ip: 172.17.112.140
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:03
-      ip6: fe80::21b:24ff:fe2d:f803
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.140
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:04
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT069
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-15.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-15.yaml
deleted file mode 100644
index 6f4b6802c52a4371ad79e5a0f96cdd55fe6e613e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-15.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-15:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:7b:48:7c
-      ip: 172.17.112.15
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:7b:46:51
-      ip6: fe80::216:36ff:fe7b:4651
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.15
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:7b:46:52
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT088
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-16.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-16.yaml
deleted file mode 100644
index 01464b7509a367b6fd9796c23578d8330e772873..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-16.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-16:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:74
-      ip: 172.17.112.16
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:df:09:0e
-      ip6: fe80::216:36ff:fedf:90e
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.16
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:df:09:0f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7250S
-      device: sda
-      size: 500107862016
-      rev: K2AO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0710QBT017
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-17.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-17.yaml
deleted file mode 100644
index bc482b3b24a21ef8b5ad4d9df63a1dc2e6fd98c5..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-17.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-17:
-  bios:
-    version: S39_3B25
-    release_date: 11/15/2007
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:4a
-      ip: 172.17.112.17
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:c3
-      ip6: fe80::21b:24ff:fe2d:f5c3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.17
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:c4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT081
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-18.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-18.yaml
deleted file mode 100644
index 97f73084a841002170608296e7bd5319fa009f05..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-18.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-18:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:a0
-      ip: 172.17.112.18
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f0:40
-      ip6: fe80::216:36ff:fed2:f040
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.18
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f0:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT014
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-19.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-19.yaml
deleted file mode 100644
index 37374461e81fe6afd3e86c2cae377b5af831f35f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-19.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-19:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d7:5b:dc
-      ip: 172.17.112.19
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d7:4d:40
-      ip6: fe80::216:36ff:fed7:4d40
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.19
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d7:4d:41
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0702QBT014
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-2.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-2.yaml
deleted file mode 100644
index 7357b5619ff8b92b9aea531c05d1daa1df46ce0e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-2.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-2:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:4c
-      ip: 172.17.112.2
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:83
-      ip6: fe80::21b:24ff:fe2d:f883
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.2
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT082
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-20.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-20.yaml
deleted file mode 100644
index 49506272acadff4e87a5c84ab3f3addb32fb5fe6..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-20.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-20:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d7:5c:c2
-      ip: 172.17.112.20
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d7:4e:f4
-      ip6: fe80::216:36ff:fed7:4ef4
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.20
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d7:4e:f5
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0702QBT020
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-21.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-21.yaml
deleted file mode 100644
index c35413af1592aa3457ba7eac481f3bda3da77a2a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-21.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-21:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:3d:cb:95
-      ip: 172.17.112.21
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:3d:ca:9d
-      ip6: fe80::21b:24ff:fe3d:ca9d
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.21
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:3d:ca:9e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT07F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-22.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-22.yaml
deleted file mode 100644
index a5a6f919f1f92b2f9be289b11b7a972724091a07..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-22.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-22:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:69
-      ip: 172.17.112.22
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:63
-      ip6: fe80::21b:24ff:fe2d:f863
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.22
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:64
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT070
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-23.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-23.yaml
deleted file mode 100644
index 229bc8b774c1eff8b84deed68c26b6360447add7..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-23.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-23:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:e0
-      ip: 172.17.112.23
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:e7
-      ip6: fe80::21b:24ff:fe2d:f6e7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.23
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:e8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT080
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-24.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-24.yaml
deleted file mode 100644
index c1a9a80a5e5e7ccb9b90adf95cd8caf7d5fa8ea7..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-24.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-24:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:ed
-      ip: 172.17.112.24
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:fa:7f
-      ip6: fe80::21b:24ff:fe2d:fa7f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.24
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:80
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0A5
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-25.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-25.yaml
deleted file mode 100644
index 72f416c23b32c15464b19a54e9914e4a8bb7690e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-25.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-25:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:12
-      ip: 172.17.112.25
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:fa:43
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.25
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-26.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-26.yaml
deleted file mode 100644
index 6dcc08dc7b40832ec28315b7489c111e941c9556..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-26.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-26:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:9b
-      ip: 172.17.112.26
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:b3
-      ip6: fe80::21b:24ff:fe2d:f7b3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.26
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT095
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-27.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-27.yaml
deleted file mode 100644
index 696670cccda2ebcfa595461c788a6d0a26c87c64..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-27.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-27:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:61
-      ip: 172.17.112.27
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:37
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.27
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:38
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7250S
-      device: sda
-      size: 500107862016
-      rev: K2AO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT074
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-28.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-28.yaml
deleted file mode 100644
index 7b0b6062aaa21093c2272d365c3e4282ebcf8618..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-28.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-28:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:01
-      ip: 172.17.112.28
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ec:d0
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.28
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ec:d1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT026
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-29.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-29.yaml
deleted file mode 100644
index 50f53ac02926cf447d0ae4f304b4297d751ebbc0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-29.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-29:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:49
-      ip: 172.17.112.29
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:bf
-      ip6: fe80::21b:24ff:fe2d:f5bf
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.29
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:c0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT073
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-3.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-3.yaml
deleted file mode 100644
index ce4a123d00a2cd31c25bb82497a5c9c289095594..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-3.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-3:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:75
-      ip: 172.17.112.3
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:df:09:12
-      ip6: fe80::216:36ff:fedf:912
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.3
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:df:09:13
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0710QBT013
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-30.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-30.yaml
deleted file mode 100644
index dbba856e4947dfae2be983b2b0e0c9af2454339e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-30.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-30:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:a3
-      ip: 172.17.112.30
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:df:08:c2
-      ip6: fe80::216:36ff:fedf:8c2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.30
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:df:08:c3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT019
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-31.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-31.yaml
deleted file mode 100644
index f250219e44ebbc79071fea7f656348512725db35..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-31.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-31:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:50
-      ip: 172.17.112.31
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:58
-      ip6: fe80::216:36ff:fed2:f358
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.31
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:59
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT02C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-32.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-32.yaml
deleted file mode 100644
index 310ab8c13dad3f7a09c20038dc0d7b4762b4353c..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-32.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-32:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:ca
-      ip: 172.17.112.32
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:92
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.32
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:93
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0AA 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-33.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-33.yaml
deleted file mode 100644
index bab3ed5308534f8ac7de7d429af97646d25d2be3..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-33.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-33:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:fd
-      ip: 172.17.112.33
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:79:5e
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.33
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:79:5f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-34.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-34.yaml
deleted file mode 100644
index 4f3dccabb4e4737c101a1a2b456a5611c48a12e8..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-34.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-34:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8e:12
-      ip: 172.17.112.34
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:81:d6
-      ip6: fe80::216:36ff:fee0:81d6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.34
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:81:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0711QBT0D5
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-35.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-35.yaml
deleted file mode 100644
index 3a29fbde1f59c3492d14b3fef519df1d62fd6edd..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-35.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-35:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:07
-      ip: 172.17.112.35
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:83
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.35
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT084 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-36.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-36.yaml
deleted file mode 100644
index c57b54afa2799b1a96acc2d4bb27c6bb570e63d1..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-36.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-36:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:ed
-      ip: 172.17.112.36
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:17
-      ip6: fe80::21b:24ff:fe2d:f717
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.36
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT061
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-37.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-37.yaml
deleted file mode 100644
index 28b8e13ed525322b3c1363a824216b0f01b97300..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-37.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-37:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:11
-      ip: 172.17.112.37
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:47
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.37
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:48
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-38.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-38.yaml
deleted file mode 100644
index 0d8de25673d38ed198048051aa596f2bf2a1a566..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-38.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-38:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f6:e1
-      ip: 172.17.112.38
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:df:09:0a
-      ip6: fe80::216:36ff:fedf:90a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.38
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:df:09:0b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0710QBT016
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-39.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-39.yaml
deleted file mode 100644
index 3f25ffac4a7eddc556b83955a483cf9a9ec32093..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-39.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-39:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:9f
-      ip: 172.17.112.39
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f0:3c
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.39
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f0:3d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0710QBT025 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-4.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-4.yaml
deleted file mode 100644
index 11227d0bf9b6fb0dfe3ba6476a98eb35a040690f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-4.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-4:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8d:40
-      ip: 172.17.112.4
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:7e:d6
-      ip6: fe80::216:36ff:fee0:7ed6
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.4
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:7e:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0711QBT0E1
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-40.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-40.yaml
deleted file mode 100644
index 6eddc5ee0083d4f531b5d3c642b4503eeca1681d..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-40.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-40:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:97
-      ip: 172.17.112.40
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ef:44
-      ip6: fe80::216:36ff:fed2:ef44
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.40
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ef:45
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT042
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-41.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-41.yaml
deleted file mode 100644
index cf24c4eec522932b6c04069425002ef93fa2af27..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-41.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-41:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:b3
-      ip: 172.17.112.41
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:36
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.41
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:37
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-42.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-42.yaml
deleted file mode 100644
index 8e9ce211c0b5eb0206728503771cb91b20dbaaf0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-42.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-42:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8c:00
-      ip: 172.17.112.42
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:79:6a
-      ip6: fe80::216:36ff:fee0:796a
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.42
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:79:6b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT09F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-43.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-43.yaml
deleted file mode 100644
index 955fd2a5325429d991174ffff63ce574f9c4955a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-43.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-43:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:d4
-      ip: 172.17.112.43
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:9c
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.43
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:9d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-44.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-44.yaml
deleted file mode 100644
index 71b20afaa133cfda091aa903d6395d733af29e64..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-44.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-44:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:40
-      ip: 172.17.112.44
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:f3
-      ip6: fe80::21b:24ff:fe2d:f8f3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.44
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT0E7
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-45.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-45.yaml
deleted file mode 100644
index f5441fac2be7d4aa3c71ca2f32e3015be358ed74..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-45.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-45:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:1a
-      ip: 172.17.112.45
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:9f
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.45
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:a0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-46.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-46.yaml
deleted file mode 100644
index 6b36a8aea5b81fca8fb94ca6e44cbee879fb6274..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-46.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-46:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.46
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:fa:a3
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.46
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-47.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-47.yaml
deleted file mode 100644
index 8fb15793f8bb2385612d2be7b81e6938772dc541..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-47.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-47:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:11
-      ip: 172.17.112.47
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:fa:3f
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.47
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:40
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C3 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-48.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-48.yaml
deleted file mode 100644
index 48a6babdc66cf0730daba5b3938eefc97e018720..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-48.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-48:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:20
-      ip: 172.17.112.48
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:ab
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.48
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:ac
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0D3 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-49.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-49.yaml
deleted file mode 100644
index a99d624548adfc80b6ae5f758b95721718047604..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-49.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-49:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:13
-      ip: 172.17.112.49
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:4b
-      ip6: fe80::21b:24ff:fe2d:f64b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.49
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:4c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT06E
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-5.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-5.yaml
deleted file mode 100644
index b78657b93b476bc178f3495d0ec8dd731299232d..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-5.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-5:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:b1
-      ip: 172.17.112.5
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:2e
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.5
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:2f
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT046
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-50.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-50.yaml
deleted file mode 100644
index 2b607a29718bfed74267cbf98036f48fcfd6a4f0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-50.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-50:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e7:80:a6
-      ip: 172.17.112.50
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e7:78:05
-      ip6: fe80::216:36ff:fee7:7805
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.50
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e7:78:06
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-51.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-51.yaml
deleted file mode 100644
index 5d9207efe2c0bab69ba070e9adce082535b5a1f6..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-51.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-51:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:c2
-      ip: 172.17.112.51
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f9:bf
-      ip6: fe80::21b:24ff:fe2d:f9bf
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.51
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f9:c0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0A0
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-52.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-52.yaml
deleted file mode 100644
index 77ba3026b68923b5c5c88bee89ff5424e6c0c59c..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-52.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-52:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:36
-      ip: 172.17.112.52
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:cb
-      ip6: fe80::21b:24ff:fe2d:f8cb
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.52
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:cc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0723QBT0A8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-53.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-53.yaml
deleted file mode 100644
index b5704f42add10b6553a5b9f60078856bc91c5dbb..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-53.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-53:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:1b
-      ip: 172.17.112.53
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:63
-      ip6: fe80::21b:24ff:fe2d:f663
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.53
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:64
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0E6
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-54.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-54.yaml
deleted file mode 100644
index b5b34eaa0fa5cafcd97cbe626d02d314171e268f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-54.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-54:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:4e
-      ip: 172.17.112.54
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:8b
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.54
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:8c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT038
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-55.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-55.yaml
deleted file mode 100644
index db420e78651b79dabc334bfe6e8dd517156a7da5..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-55.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-55:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:c9
-      ip: 172.17.112.55
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f9:d7
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.55
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f9:d8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0AE 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-56.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-56.yaml
deleted file mode 100644
index 806d981a0c7b53d0b3e11f512eb1c465cc2a1078..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-56.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-56:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c1:2d
-      ip: 172.17.112.56
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b9:db
-      ip6: fe80::21b:24ff:fe2d:b9db
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.56
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b9:dc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  chassis:
-    serial_number: 0722QBT0D0
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-57.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-57.yaml
deleted file mode 100644
index d62e3beaea30fd3b7fb708abb5d2da57c40fb557..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-57.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-57:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:f9
-      ip: 172.17.112.57
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b9:0b
-      ip6: fe80::21b:24ff:fe2d:b90b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.57
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b9:0c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0722QBT0C5
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-58.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-58.yaml
deleted file mode 100644
index cb20a46143238de1937b5327ce64e44ba03ce9af..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-58.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-58:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:fb
-      ip: 172.17.112.58
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b9:13
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.58
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b9:14
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0722QBT0C3 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-59.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-59.yaml
deleted file mode 100644
index 9ed37c7f3db9abbc2374af9db06f7dd87b081bc3..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-59.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-59:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:e9
-      ip: 172.17.112.59
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:07
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.59
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:08
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-6.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-6.yaml
deleted file mode 100644
index 1bc8698668c707c7d6f811d0475001b322708548..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-6.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-6:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f7:dd
-      ip: 172.17.112.6
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ee:f8
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.6
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ee:f9
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-60.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-60.yaml
deleted file mode 100644
index 3658778b5b128fdc61baf53ceb7ec3bcd918e986..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-60.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-60:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:0d
-      ip: 172.17.112.60
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:3b
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.60
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:3c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-61.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-61.yaml
deleted file mode 100644
index fc5b1792eb37d9b2a8216008a694ab42710d9af0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-61.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-61:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:9e
-      ip: 172.17.112.61
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:c7
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.61
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:c8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-62.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-62.yaml
deleted file mode 100644
index f3b386401c1905d261360ed20ebc353fadb934af..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-62.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-62:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:94
-      ip: 172.17.112.62
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:9b
-      ip6: fe80::21b:24ff:fe2d:f79b
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.62
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:9c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT03A
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-63.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-63.yaml
deleted file mode 100644
index d5b1dc38ac37ac35b50c2a0294b0906a54290cf6..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-63.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-63:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:54
-      ip: 172.17.112.63
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b7:17
-      ip6: fe80::21b:24ff:fe2d:b717
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.63
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b7:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0722QBT0C9
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-64.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-64.yaml
deleted file mode 100644
index e0d7e1ac9d12538a3b849550035cecf99e9d4ac3..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-64.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-64:
-  bios:
-    version: S39_3D15
-    release_date: 05/20/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:23:8b:8a:34:4e
-      ip: 172.17.112.64
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:23:8b:8a:36:69
-      ip6: fe80::223:8bff:fe8a:3669
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.64
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:23:8b:8a:36:6a
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2 with Dual Core.xxxxxxxxx 
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-65.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-65.yaml
deleted file mode 100644
index 4ad06e304683c6fa34daaedb4ed7e8dd7af75d93..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-65.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-65:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:1d:ee:58
-      ip: 172.17.112.65
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:1d:ea:9a
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.65
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:1d:ea:9b
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0722QBT0C7
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-66.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-66.yaml
deleted file mode 100644
index b02915e338985feee627210dd17dee92ea5d93e1..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-66.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-66:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:98
-      ip: 172.17.112.66
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:9f
-      ip6: fe80::21b:24ff:fe2d:f79f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.66
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:a0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT03D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-67.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-67.yaml
deleted file mode 100644
index f613a94fa2cc0ec56bf7e7b1bbea6cc3dc031072..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-67.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-67:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:38
-      ip: 172.17.112.67
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:d3
-      ip6: fe80::21b:24ff:fe2d:f8d3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.67
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:d4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0723QBT039
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-68.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-68.yaml
deleted file mode 100644
index 76509355d3c6d706f51338d001efc2a2a76e615e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-68.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-68:
-  bios:
-    version: S39_3B25
-    release_date: 11/15/2007
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:e0:57:d2
-      ip: 172.17.112.68
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:e0:56:d7
-      ip6: fe80::21b:24ff:fee0:56d7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.68
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:e0:56:d8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-69.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-69.yaml
deleted file mode 100644
index 514e9e3beefdc135901f6a47134f7b24b5051869..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-69.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-69:
-  bios:
-    version: S39_3B26
-    release_date: 06/25/2008
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:d4
-      ip: 172.17.112.69
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f9:f7
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.69
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f9:f8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0BD
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-7.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-7.yaml
deleted file mode 100644
index 2fd1d50f0a004a5c0f40b122a4385b78d06ae029..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-7.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-7:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:df:0a:6e
-      ip: 172.17.112.7
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ef:38
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.7
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ef:39
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-70.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-70.yaml
deleted file mode 100644
index dc84bdb07d368d24e432c5748c2a5ec4f25e20c0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-70.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-70:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:bf:ef
-      ip: 172.17.112.70
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b6:23
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.70
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b6:24
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-71.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-71.yaml
deleted file mode 100644
index 8f4be8b683484bb33f6fdfeb226366be58ea03bd..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-71.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-71:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:55
-      ip: 172.17.112.71
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:a7
-      ip6: fe80::21b:24ff:fe2d:f8a7
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.71
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:a8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0723QBT063
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-72.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-72.yaml
deleted file mode 100644
index 8dec91ee65fabe6e249dad40620328da1467bc65..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-72.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-72:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:3d
-      ip: 172.17.112.72
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b8:97
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.72
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b8:98
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-73.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-73.yaml
deleted file mode 100644
index fd6756100bb472aa157b4b56d70a05bf1eb5d63c..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-73.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-73:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:4e
-      ip: 172.17.112.73
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b6:ff
-      ip6: fe80::21b:24ff:fe2d:b6ff
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.73
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b7:00
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT041
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-74.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-74.yaml
deleted file mode 100644
index 9157b76b8427ff998a82dcfa3fc9f00753c22df7..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-74.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-74:
-  bios:
-    version: S39_3B27
-    release_date: 02/04/2009
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:ff:d9:be
-      ip: 172.17.112.74
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:ff:d6:02
-      ip6: fe80::216:36ff:feff:d602
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.74
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:ff:d6:03
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-75.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-75.yaml
deleted file mode 100644
index ddd715721ce06410e89dd8158e22b787e4375694..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-75.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-75:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:e1
-      ip: 172.17.112.75
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:eb
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.75
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:ec
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-76.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-76.yaml
deleted file mode 100644
index 3fbfb7527685fb5965d56782f3166be8a827ae8f..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-76.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-76:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:fc
-      ip: 172.17.112.76
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b9:17
-      ip6: fe80::21b:24ff:fe2d:b917
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.76
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b9:18
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0722QBT0D1
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-77.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-77.yaml
deleted file mode 100644
index a8be3dea331a5684529e16fc26ac9e7fb8d672a9..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-77.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-77:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:55
-      ip: 172.17.112.77
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b7:1b
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.77
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b7:1c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-78.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-78.yaml
deleted file mode 100644
index da0e3666ab5d87a469507b059d7d17a1ce4243fb..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-78.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-78:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fd:22
-      ip: 172.17.112.78
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:b3
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.78
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:b4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-79.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-79.yaml
deleted file mode 100644
index 651685cfee8efa4cb27c1c0a67d76bede3131b22..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-79.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-79:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:8d
-      ip: 172.17.112.79
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:ee:2c
-      ip6: fe80::216:36ff:fed2:ee2c
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.79
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:ee:2d
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0711QBT0D2
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-8.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-8.yaml
deleted file mode 100644
index 381b1db9dc7ce8af9c5f0e567d129ef6c6c432f5..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-8.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-8:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e0:8b:d2
-      ip: 172.17.112.8
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:b2
-      ip6: fe80::216:36ff:fee0:78b2
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.8
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:78:b3
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT09D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-80.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-80.yaml
deleted file mode 100644
index 10527c43ad6a1eb893ad37ed299774f35848938a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-80.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-80:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:e7:80:80
-      ip: 172.17.112.80
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e7:77:6d
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.80
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e7:77:6e
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-81.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-81.yaml
deleted file mode 100644
index db2f5cd6b124a367def5ff6024901bfbb7f9d4fb..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-81.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-81:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.81
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:2f
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.81
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:30
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT093 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-82.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-82.yaml
deleted file mode 100644
index 58b4fb7f09b6e98f345bdab1a5300116a0096ddc..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-82.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-82:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.82
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:43
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.82
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:44
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT03F 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-83.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-83.yaml
deleted file mode 100644
index b70c32b8174ea8b7458770be601e98d81f180010..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-83.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-83:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:54
-      ip: 172.17.112.83
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:a3
-      ip6: fe80::21b:24ff:fe2d:f8a3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.83
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT08F
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-84.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-84.yaml
deleted file mode 100644
index d97d1369b7148f985bf48d1d971382b726ae50ec..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-84.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-84:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.84
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:09:3d:12:80:91
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.84
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-85.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-85.yaml
deleted file mode 100644
index 9657968bf62cf752f31458a2682fee82350ebef0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-85.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-85:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.85
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:76:40:e3
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.85
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:76:40:e4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT07E 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-86.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-86.yaml
deleted file mode 100644
index 4b14be7d414bdf4ee9b41c18bb3052b77db0fe41..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-86.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-86:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.86
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:bb
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.86
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:bc
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT086
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-87.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-87.yaml
deleted file mode 100644
index 669377fc9c50191ad21af4280d74607eb6463a79..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-87.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-87:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.87
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:78:9a
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.87
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:fa:a4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0C8
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-88.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-88.yaml
deleted file mode 100644
index 3d73e469bb3ce999dfd8b5cf59ab965445e5a4d0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-88.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-88:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:c0:ab
-      ip: 172.17.112.88
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:b7:d3
-      ip6: fe80::21b:24ff:fe2d:b7d3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.88
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:b7:d4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0722QBT063
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-89.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-89.yaml
deleted file mode 100644
index f949f764f9a262094b87f5ba0053abd64b06e7ec..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-89.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-89:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.89
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f6:1b
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.89
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f6:1c
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT0BC 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-9.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-9.yaml
deleted file mode 100644
index 94d238fe2cb33ec9022d5e31f1b81b693dd4ef47..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-9.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-9:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:76:56:c5
-      ip: 172.17.112.9
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:76:52:ab
-      ip6: fe80::216:36ff:fe76:52ab
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.9
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:76:52:ac
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: xxxxxxxxxx
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  main_memory:
-    ram_size: 8588886016
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-90.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-90.yaml
deleted file mode 100644
index fe92421bd8db76f3ca667e9325f57f9785b69be4..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-90.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-90:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.90
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:87
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.90
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:88
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT08C
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-91.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-91.yaml
deleted file mode 100644
index d8a45d0e59b571ad1f7c6e852349a657bc6de462..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-91.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-91:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.91
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:f3
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.91
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:f4
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT075 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-92.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-92.yaml
deleted file mode 100644
index d1e57872a70004a7684089924afb34986e5d1426..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-92.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-92:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.92
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:3d:c9:d9
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.92
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:3d:c9:da
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT07B 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-93.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-93.yaml
deleted file mode 100644
index a59e3097200c8e4a3115b01e64a9aeaf245ecef6..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-93.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-93:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  network_interfaces:
-    bmc:
-      mac: 00:16:36:d2:f8:6b
-      ip: 172.17.112.93
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:d2:f3:f0
-      ip6: fe80::216:36ff:fed2:f3f0
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.93
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:d2:f3:f1
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  chassis:
-    serial_number: 0712QBT0AD
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-94.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-94.yaml
deleted file mode 100644
index e736d248556505a257294d5af9db78878978f240..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-94.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-94:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.94
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f5:e7
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.94
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f5:e8
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT08B
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-95.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-95.yaml
deleted file mode 100644
index 5c7d67a8a44f027f74b300c70dc23d746cf77074..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-95.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-95:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.95
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:7f:d6
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.95
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:7f:d7
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0DE 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-96.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-96.yaml
deleted file mode 100644
index fad99a44ed3fc3a82d3b4254c42eae73c3b134dc..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-96.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-96:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.96
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:ff
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.96
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:00
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT066
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-97.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-97.yaml
deleted file mode 100644
index 34e9c2ffe5566ff61cc4c6f7ac45e2bb1b45d6dd..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-97.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-97:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.97
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f7:83
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.97
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f7:84
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0723QBT08E 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-98.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-98.yaml
deleted file mode 100644
index 90b5a0452f7ed8c803cbf0c1e67c6f9d21c8fbb0..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-98.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-98:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fb:f8
-      ip: 172.17.112.98
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:16:36:e0:7f:22
-      ip6: fe80::21b:24ff:fe2d:faa3
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.98
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:16:36:e0:7f:23 
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  supported_job_types:
-    virtual: amd-v
-  chassis:
-    serial_number: 0712QBT0DD 
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-99.yaml b/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-99.yaml
deleted file mode 100644
index 23afd54536dee41df125dfdc03a48bbd91a8135e..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/nodes/pastel-99.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-pastel-99:
-  bios:
-    version: S39_3B13
-    release_date: 12/13/2006
-    vendor: Sun Microsystems
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
-  block_devices:
-    sda:
-      model: HITACHI HDS7225S
-      device: sda
-      size: 250056000000
-      rev: V5DO
-      vendor: Hitachi
-  network_interfaces:
-    bmc:
-      mac: 00:1b:24:2d:fc:53
-      ip: 172.17.112.99
-    eth0:
-      mounted: true
-      rate: 1000000000
-      mac: 00:1b:24:2d:f8:9f
-      ip6: fe80::21b:24ff:fe2d:f89f
-      management: false
-      enabled: true
-      interface: Ethernet
-      ip: 172.16.112.99
-      driver: forcedeth
-      mountable: true
-    eth1:
-      mounted: false
-      mac: 00:1b:24:2d:f8:a0
-      management: false
-      enabled: false
-      interface: Ethernet
-      driver: forcedeth
-      mountable: false
-  chassis:
-    serial_number: 0723QBT06D
-    manufacturer: Sun Microsystems
-    product_name: Sun Fire X2200 M2
-  supported_job_types:
-    virtual: amd-v
-  main_memory:
-    ram_size: 8588886016
-  processor:
-    model: AMD Opteron
-    cache_l1d: 65536
-    clock_speed: 2600000000
-    other_description: Dual-Core AMD Opteron(tm) Processor 2218
-    version: 2218
-    cache_l2: 1048576
-    cache_l3: 0
-    vendor: AMD
-    instruction_set: x86-64
-    cache_l1i: 65536
-  architecture:
-    smp_size: 2
-    platform_type: x86_64
-    smt_size: 4
diff --git a/generators/input/sites/toulouse/clusters/pastel/pastel.rb b/generators/input/sites/toulouse/clusters/pastel/pastel.rb
deleted file mode 100644
index df22ec6e13fbdaa740a96e86d9a0207ff10701ba..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/pastel.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-site :toulouse do |site_uid|
-
-  cluster :pastel do |cluster_uid|
-    model "Sun Fire X2200 M2"
-    created_at Time.parse("2007-11-29").httpdate
-    kavlan true
-    production true
-
-    140.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-
-        performance({
-        :node_flops     => 17.37.G,
-        :core_flops     => 4.463.G
-      })
-
-        supported_job_types({
-          :deploy       => true,
-          :besteffort   => true,
-          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual')
-        })
-
-        architecture({
-          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
-          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
-          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
-        })
-
-        processor({
-          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
-          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
-          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
-          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
-          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
-          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
-          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
-          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
-          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
-          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
-          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
-        })
-
-        main_memory({
-          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
-          :virtual_size => nil
-        })
-
-        operating_system({
-          :name     => "debian",
-          :release  => "Wheezy",
-          :version  => "7",
-          :kernel   => "3.2.0-4-amd64"
-        })
-
-        storage_devices [{
-          :interface  => 'SATA',
-          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
-          :driver     => "sata_nv",
-          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
-          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
-          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
-          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
-          :storage    => 'HDD'
-        }]
-
-        network_adapters [{
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
-          :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
-          :bridged          => true,
-          :vendor           => "NVIDIA",
-          :version          => "MCP55 Pro",
-          :device           => "eth0",
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
-          :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
-          :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => net_switch_lookup('toulouse', 'pastel', node_uid),
-          :switch_port      => net_port_lookup('toulouse', 'pastel', node_uid),
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
-        },
-        {
-          :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
-          :rate             => 1.G,
-          :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
-          :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
-          :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
-          :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => false,
-          :device           => "eth1",
-          :vendor           => "NVIDIA",
-          :version          => "MCP55 Pro",
-          :switch           => nil,
-          :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
-          :network_address  => "#{node_uid}-eth1.#{site_uid}.grid5000.fr",
-          :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
-        },
-        { :interface => 'Ethernet',
-          :rate => 1.G,
-          :mac => lookup(node_uid, node_uid, 'network_interfaces','bmc','mac'),
-          :vendor => "Broadcom",
-          :version => "BCM5715c",
-          :enabled => true,
-          :management => true,
-          :mountable => false,
-          :mounted => false,
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => lookup(node_uid, node_uid,'network_interfaces','bmc','ip'),
-          :ip6 => nil,
-          :switch => '<unknown>'
-        }]
-
-        chassis({
-          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
-          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
-          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
-        })
-
-        bios({
-          :version	=> lookup(node_uid, node_uid, 'bios', 'version'),
-          :vendor	=> lookup(node_uid, node_uid, 'bios', 'vendor'),
-          :release_date	=> lookup(node_uid, node_uid, 'bios', 'release_date')
-        })
-
-        gpu({
-          :gpu  => false
-        })
-
-        monitoring({
-          :wattmeter  => false
-        })
-
-      end
-    end
-  end
-end
diff --git a/generators/input/sites/toulouse/clusters/pastel/pastel_manual.yaml b/generators/input/sites/toulouse/clusters/pastel/pastel_manual.yaml
deleted file mode 100644
index c0ae7b5e5c7c1b03a98706d99ff1e252bd3db87b..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/clusters/pastel/pastel_manual.yaml
+++ /dev/null
@@ -1,701 +0,0 @@
----
-pastel-1:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/1
-pastel-2:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/2
-pastel-3:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/3
-pastel-4:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/4
-pastel-5:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/5
-pastel-6:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/6
-pastel-7:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/7
-pastel-8:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/8
-pastel-9:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/9
-pastel-10:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/10
-pastel-11:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/11
-pastel-12:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/12
-pastel-13:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/13
-pastel-14:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/14
-pastel-15:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/15
-pastel-16:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/16
-pastel-17:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/17
-pastel-18:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/18
-pastel-19:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/19
-pastel-20:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/20
-pastel-21:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/21
-pastel-22:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/22
-pastel-23:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/23
-pastel-24:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/24
-pastel-25:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/25
-pastel-26:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/26
-pastel-27:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/27
-pastel-28:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/28
-pastel-29:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/29
-pastel-30:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/30
-pastel-31:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/31
-pastel-32:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/32
-pastel-33:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/33
-pastel-34:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/34
-pastel-35:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/37
-pastel-36:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/35
-pastel-37:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/36
-pastel-38:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/38
-pastel-39:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/39
-pastel-40:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi1/40
-pastel-41:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/1
-pastel-42:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/2
-pastel-43:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/3
-pastel-44:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/4
-pastel-45:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/5
-pastel-46:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/6
-pastel-47:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/7
-pastel-48:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/8
-pastel-49:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/9
-pastel-50:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/10
-pastel-51:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/11
-pastel-52:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/12
-pastel-53:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/13
-pastel-54:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/14
-pastel-55:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/15
-pastel-56:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/16
-pastel-57:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/17
-pastel-58:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/18
-pastel-59:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/19
-pastel-60:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/20
-pastel-61:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/21
-pastel-62:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/22
-pastel-63:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/23
-pastel-64:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/24
-pastel-65:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/25
-pastel-66:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/26
-pastel-67:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/27
-pastel-68:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/28
-pastel-69:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/29
-pastel-70:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/30
-pastel-71:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/31
-pastel-72:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/32
-pastel-73:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/33
-pastel-74:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/34
-pastel-75:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/35
-pastel-76:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/36
-pastel-77:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/37
-pastel-78:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/38
-pastel-79:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/39
-pastel-80:
-  network_interfaces:
-    eth0:
-      switch_name: r4
-      switch_port: Gi4/40
-pastel-81:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/1
-pastel-82:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/2
-pastel-83:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/3
-pastel-84:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/4
-pastel-85:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/5
-pastel-86:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/6
-pastel-87:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/7
-pastel-88:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/8
-pastel-89:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/9
-pastel-90:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/10
-pastel-91:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/11
-pastel-92:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/12
-pastel-93:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/13
-pastel-94:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/14
-pastel-95:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/15
-pastel-96:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/16
-pastel-97:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/17
-pastel-98:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/18
-pastel-99:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/19
-pastel-100:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/20
-pastel-101:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/30
-pastel-102:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/31
-pastel-103:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/32
-pastel-104:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/33
-pastel-105:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/34
-pastel-106:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/35
-pastel-107:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/36
-pastel-108:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/37
-pastel-109:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/38
-pastel-110:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/39
-pastel-111:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/40
-pastel-112:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/41
-pastel-113:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/42
-pastel-114:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/43
-pastel-115:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/44
-pastel-116:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/45
-pastel-117:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/46
-pastel-118:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/47
-pastel-119:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/48
-pastel-120:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/1
-pastel-121:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/21
-pastel-122:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/22
-pastel-123:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/23
-pastel-124:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/24
-pastel-125:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/25
-pastel-126:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/26
-pastel-127:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/27
-pastel-128:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/28
-pastel-129:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi2/29
-pastel-130:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/2
-pastel-131:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/3
-pastel-132:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/4
-pastel-133:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/5
-pastel-134:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/6
-pastel-135:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/7
-pastel-136:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/8
-pastel-137:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/9
-pastel-138:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/10
-pastel-139:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/11
-pastel-140:
-  network_interfaces:
-    eth0:
-      switch_name: gw-toulouse
-      switch_port: Gi3/12
diff --git a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml b/generators/input/sites/toulouse/net-links/gw-toulouse.yaml
deleted file mode 100644
index adddf5a00d21ba3711f138da548f980091bb7c37..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
----
-gw-toulouse:
-  model: Cisco WS-C6506-E
-  kind: router
-  site: toulouse
-  snmp_community: public
-  backplane_bps: 2000000000000
-  routes: {}
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    snmp_pattern: Vlan%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.127.254
-    "vlan101":
-      addresses:
-        - 172.17.127.254
-    "vlan103":
-      addresses:
-        - 192.168.69.1   
-    "vlan500":
-      addresses:
-        - 192.168.4.16
-    "vlan701":
-      name: kavlan-1
-      addresses:
-        - 192.168.192.0/20
-    "vlan702":
-      name: kavlan-2
-      addresses:
-        - 192.168.208.0/20
-    "vlan703":
-      name: kavlan-3
-      addresses:
-        - 192.168.224.0/20
-    "vlan704":
-      name: kavlan-4
-      addresses:
-        - 10.28.0.0/18
-    "vlan705":
-      name: kavlan-5
-      addresses:
-        - 10.28.64.0/18	
-    "vlan706":
-      name: kavlan-6
-      addresses:
-        - 10.28.128.0/18
-    "vlan707":
-      name: kavlan-7
-      addresses:
-        - 10.28.192.0/18	
-    "vlan708":
-      name: kavlan-8
-      addresses:
-        - 10.29.0.0/18	
-    "vlan709":
-      name: kavlan-9
-      addresses:
-        - 10.29.64.0/18
-    "vlan717":
-      name: kavlan-17
-      addresses:
-        - 10.31.192.0/18
-
-  linecards:
-    1:
-      kind: virtual
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 80000000000
-      rate: 10000000000
-      ports:
-        1: renater-toulouse
-        2:
-          kind: switch
-          uid: r4
-    2:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 80000000000
-      rate: 1000000000
-      ports:
-        1: pastel-81
-        2: pastel-82
-        3: pastel-83
-        4: pastel-84
-        5: pastel-85
-        6: pastel-86
-        7: pastel-87
-        8: pastel-88
-        9: pastel-89
-        10: pastel-90
-        11: pastel-91
-        12: pastel-92
-        13: pastel-93
-        14: pastel-94
-        15: pastel-95
-        16: pastel-96
-        17: pastel-97
-        18: pastel-98
-        19: pastel-99
-        20: pastel-100
-        21: pastel-121
-        22: pastel-122
-        23: pastel-123
-        24: pastel-124
-        25: pastel-125
-        26: pastel-126
-        27: pastel-127
-        28: pastel-128
-        29: pastel-129
-        30: pastel-101
-        31: pastel-102
-        32: pastel-103
-        33: pastel-104
-        34: pastel-105
-        35: pastel-106
-        36: pastel-107
-        37: pastel-108
-        38: pastel-109
-        39: pastel-110
-        40: pastel-111
-        41: pastel-112
-        42: pastel-113
-        43: pastel-114
-        44: pastel-115
-        45: pastel-116
-        46: pastel-117
-        47: pastel-118
-        48: pastel-119
-    3:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 80000000000
-      rate: 1000000000
-      ports:
-        36:
-          kind: switch
-          uid: CICT
-        1: pastel-120
-        2: pastel-130
-        3: pastel-131
-        4: pastel-132
-        5: pastel-133
-        6: pastel-134
-        7: pastel-135
-        8: pastel-136
-        9: pastel-137
-        10: pastel-138
-        11: pastel-139
-        12: pastel-140
-        37:
-          uid: spastel1-ipmi
-          port: bmc
-          kind: switch
-        45:
-          uid: g5kservices2
-          kind: other
-        46:
-          uid: g5kservices3
-          kind: other
-        47:
-          uid: g5kservices1
-          kind: other
-        48:
-          uid: nfs-g5k
-          kind: other
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/toulouse/net-links/r4.yaml b/generators/input/sites/toulouse/net-links/r4.yaml
deleted file mode 100644
index ce08c2c870d22f7715ac0e4c4c8eccecba612851..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/net-links/r4.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
----
-r4:
-  model: Cisco 7606
-  kind: switch
-  site: toulouse
-  snmp_community: public
-  backplane_bps: 480000000000
-  routes: {}
-  mtu: 9216
-  vlans:
-    naming_pattern: Vlan%VLANID%
-    snmp_pattern: Vlan-%VLANID%
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.127.201
-  linecards:
-    1:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      ports:
-        1: pastel-1
-        2: pastel-2
-        3: pastel-3
-        4: pastel-4
-        5: pastel-5
-        6: pastel-6
-        7: pastel-7
-        8: pastel-8
-        9: pastel-9
-        10: pastel-10
-        11: pastel-11
-        12: pastel-12
-        13: pastel-13
-        14: pastel-14
-        15: pastel-15
-        16: pastel-16
-        17: pastel-17
-        18: pastel-18
-        19: pastel-19
-        20: pastel-20
-        21: pastel-21
-        22: pastel-22
-        23: pastel-23
-        24: pastel-24
-        25: pastel-25
-        26: pastel-26
-        27: pastel-27
-        28: pastel-28
-        29: pastel-29
-        30: pastel-30
-        31: pastel-31
-        32: pastel-32
-        33: pastel-33
-        34: pastel-34
-        35: pastel-36
-        36: pastel-37
-        37: pastel-35
-        38: pastel-38
-        39: pastel-39
-        40: pastel-40
-    2:
-      kind: router
-      naming_pattern: Te%LINECARD%/%PORT%
-      snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 10000000000
-      ports:
-        1:
-          uid: gw-toulouse
-    4:
-      kind: node
-      naming_pattern: Gi%LINECARD%/%PORT%
-      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
-      backplane_bps: 40000000000
-      rate: 1000000000
-      ports:
-        1: pastel-41
-        2: pastel-42
-        3: pastel-43
-        4: pastel-44
-        5: pastel-45
-        6: pastel-46
-        7: pastel-47
-        8: pastel-48
-        9: pastel-49
-        10: pastel-50
-        11: pastel-51
-        12: pastel-52
-        13: pastel-53
-        14: pastel-54
-        15: pastel-55
-        16: pastel-56
-        17: pastel-57
-        18: pastel-58
-        19: pastel-59
-        20: pastel-60
-        21: pastel-61
-        22: pastel-62
-        23: pastel-63
-        24: pastel-64
-        25: pastel-65
-        26: pastel-66
-        27: pastel-67
-        28: pastel-68
-        29: pastel-69
-        30: pastel-70
-        31: pastel-71
-        32: pastel-72
-        33: pastel-73
-        34: pastel-74
-        35: pastel-75
-        36: pastel-76
-        37: pastel-77
-        38: pastel-78
-        39: pastel-79
-        40: pastel-80
-  channels:
-    naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/toulouse/pdus.rb b/generators/input/sites/toulouse/pdus.rb
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/generators/input/sites/toulouse/toulouse.rb b/generators/input/sites/toulouse/toulouse.rb
deleted file mode 100644
index 835e87753262c5ffaf0be0b8393b31f0bdb2c17a..0000000000000000000000000000000000000000
--- a/generators/input/sites/toulouse/toulouse.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-site :toulouse do |site_uid|
-  name "Toulouse"
-  location "Toulouse, France"
-  web "https://www.grid5000.fr/mediawiki/index.php/Toulouse:Home"
-  description "Toulouse Grid'5000 Site"
-  latitude 43.6167
-  longitude 1.4333
-  email_contact "support-staff@lists.grid5000.fr"
-  sys_admin_contact "support-staff@lists.grid5000.fr"
-  security_contact "support-staff@lists.grid5000.fr"
-  user_support_contact "support-staff@lists.grid5000.fr"
-  compilation_server false
-  kavlan_ip_range "10.28.0.0/14"
-  virt_ip_range "10.160.0.0/14"
-  storage5k false
-  production true
-end
diff --git a/generators/lib/g5k_generator.rb b/generators/lib/g5k_generator.rb
index f8156721922f44a23b473893cdd0694dc5c33d59..86d00b52bc415191b88dc36ce44bc9bbee7e2e77 100755
--- a/generators/lib/g5k_generator.rb
+++ b/generators/lib/g5k_generator.rb
@@ -207,7 +207,7 @@ module G5K
 
     # This method is used exclusivly for environments. Example:
     # environment 'squeeze-x64-xen-0.8' do
-    #  available_on %w{grenoble lille lyon nancy rennes sophia toulouse}
+    #  available_on %w{grenoble lille lyon nancy rennes sophia}
     # end    
     def available_on(sites_uid)
       env_uid = @context[:uid]