diff --git a/scenarios/default_scenario.xml b/scenarios/default_scenario.xml
index 2ec1de011..6a8e8d527 100644
--- a/scenarios/default_scenario.xml
+++ b/scenarios/default_scenario.xml
@@ -9,13 +9,13 @@
 		<system_name>storage_server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability privilege="user" access="remote" type="" cve="" />
-		<vulnerability privilege="root" access="local" type="" cve="" />
+		<vulnerability privilege="user" access="remote" />
+		<vulnerability privilege="root" access="local" />
 
-		<service type="httpd"></service>
+		<service type="httpd"/>
 		<service/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/2_apache_servers_one_with_mysql.xml b/scenarios/simple_examples/2_apache_servers_one_with_mysql.xml
index fbb9959c2..16b14aa03 100644
--- a/scenarios/simple_examples/2_apache_servers_one_with_mysql.xml
+++ b/scenarios/simple_examples/2_apache_servers_one_with_mysql.xml
@@ -8,19 +8,19 @@
 		<system_name>apache_server_with_mysql</system_name>
 		<base platform="linux"/>
 
-		<service module_path="modules/services/unix/database/mysql"></service>
-		<service module_path="modules/services/unix/http/apache"></service>
+		<service module_path="modules/services/unix/database/mysql"/>
+		<service module_path="modules/services/unix/http/apache"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 	<system>
 		<system_name>apache_server</system_name>
 		<base platform="linux"/>
 
-		<service module_path="modules/services/unix/http/apache"></service>
+		<service module_path="modules/services/unix/http/apache"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/apache_service.xml b/scenarios/simple_examples/apache_service.xml
index c6774b488..3db945547 100644
--- a/scenarios/simple_examples/apache_service.xml
+++ b/scenarios/simple_examples/apache_service.xml
@@ -8,9 +8,9 @@
 		<system_name>apache_server</system_name>
 		<base platform="linux"/>
 
-		<service module_path="modules/services/unix/http/apache"></service>
+		<service module_path="modules/services/unix/http/apache"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/distcc_vulnerability.xml b/scenarios/simple_examples/distcc_vulnerability.xml
index d41d89a06..383f18cad 100644
--- a/scenarios/simple_examples/distcc_vulnerability.xml
+++ b/scenarios/simple_examples/distcc_vulnerability.xml
@@ -8,9 +8,9 @@
 		<system_name>distcc_server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability module_path=".*distcc"></vulnerability>
+		<vulnerability module_path=".*distcc" />
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp" />
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/lamp_service.xml b/scenarios/simple_examples/lamp_service.xml
index 06637c3df..ad8839a27 100644
--- a/scenarios/simple_examples/lamp_service.xml
+++ b/scenarios/simple_examples/lamp_service.xml
@@ -8,9 +8,9 @@
 		<system_name>lamp_server</system_name>
 		<base platform="linux"/>
 
-		<service module_path="modules/services/unix/http/lamp"></service>
+		<service module_path="modules/services/unix/http/lamp"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/mountable_nfs_vulnerability.xml b/scenarios/simple_examples/mountable_nfs_vulnerability.xml
index 78ecfa096..88182a391 100644
--- a/scenarios/simple_examples/mountable_nfs_vulnerability.xml
+++ b/scenarios/simple_examples/mountable_nfs_vulnerability.xml
@@ -8,9 +8,9 @@
 		<system_name>file_server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability module_path=".*nfs_overshare"></vulnerability>
+		<vulnerability module_path=".*nfs_overshare"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/vsftpd_vulnerability.xml b/scenarios/simple_examples/vsftpd_vulnerability.xml
index fa4c907fd..a0775341a 100644
--- a/scenarios/simple_examples/vsftpd_vulnerability.xml
+++ b/scenarios/simple_examples/vsftpd_vulnerability.xml
@@ -8,9 +8,9 @@
 		<system_name>file_server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability module_path=".*vsftpd.*"></vulnerability>
+		<vulnerability module_path=".*vsftpd.*"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>
diff --git a/scenarios/simple_examples/writeable_shadow_vulnerability.xml b/scenarios/simple_examples/writeable_shadow_vulnerability.xml
index 79f5e58b5..c00029095 100644
--- a/scenarios/simple_examples/writeable_shadow_vulnerability.xml
+++ b/scenarios/simple_examples/writeable_shadow_vulnerability.xml
@@ -8,9 +8,9 @@
 		<system_name>server</system_name>
 		<base platform="linux"/>
 
-		<vulnerability module_path=".*writeable_shadow"></vulnerability>
+		<vulnerability module_path=".*writeable_shadow"/>
 
-		<network type="private_network" range="dhcp"></network>
+		<network type="private_network" range="dhcp"/>
 	</system>
 
 </scenario>