Removed testing comments

modules/services/unix/http/apache/secgen_metadata.xml

@@ -23,12 +23,4 @@
   <requires>
     <type>update</type>
   </requires>
-  <!-- for testing purposes -->
-  <!--<requires>-->
-    <!--<type>THIS DOES NOT EXIST</type>-->
-  <!--</requires>-->
-  <!--<requires>-->
-    <!--<type>ftp</type>-->
-  <!--</requires>-->
-
 </service>

modules/vulnerabilities/unix/local/writeable_shadow/secgen_metadata.xml

@@ -28,14 +28,4 @@
     <author>Lewis Ardern</author>
   </conflict>
 
-  <!-- for testing purposes, likely to trigger an unresolveable conflict with the default scenario (sometimes) -->
-  <!--<conflict>-->
-    <!--<type>ftp</type>-->
-  <!--</conflict>-->
-  <!-- for testing purposes -->
-  <!--<requires>-->
-    <!--<type>httpd</type>-->
-    <!--<software_name>apache</software_name>-->
-  <!--</requires>-->
-
 </vulnerability>

scenarios/default_scenario.xml

@@ -9,8 +9,6 @@
 		<system_name>storage_server</system_name>
 		<base platform="linux"/>
 
-		<!--<service type="httpd"/>-->
-
 		<vulnerability privilege="user" access="remote" />
 		<vulnerability privilege="root" access="local" />