diff --git a/INSTALL.md b/INSTALL.md
index bb97ef23d..92b0f2728 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -431,25 +431,16 @@ $ php deploy/DeployRequiredDataRunner.php requiredData
 
 ### OPTIONAL: Deploy Sample Data<a id="deploy-sample-data"></a>
 
-You can choose to deploy some sample data to seed your DB with sample users,
-sites and services. Two sample data sets are available. Choose one of -
+You can choose to deploy some sample data to seed your database. It consists of
+a project which contains 2 NGIs, and another NGI not in a project. Each NGI contains
+multiple sites which have services belonging to service groups, and the database is
+populated with unique sample users, which have roles over relevant site, NGI and
+project entities. The sample data has no real-world associations.
 
-1. Minimal - just enough to get going with no real-world associations.
-
-    ```bash
-    $ cd lib/Doctrine
-    $ php deploy/DeploySampleDataRunner.php simpleSampleData
-    ```
-1. Full - A full set of sample data to use. Consists of a project which contains
-2 NGIs and another NGI not in a project. Each NGI contains multiple sites which
-have services belonging to service groups, and the database is populated with
-unique sample users, which have roles over relevant site, NGI or project entities.
-The sample data has no real-world associations.
-
-    ```bash
-    $ cd lib/Doctrine
-    $ php deploy/DeploySampleDataRunner.php sampleData
-    ```
+```bash
+$ cd lib/Doctrine
+$ php deploy/DeploySampleDataRunner.php sampleData
+```
 
 ### ORACLE ONLY: Deploy an existing DB .dmp file to populate your DB<a id="deploy-existing-dump"></a>
 
diff --git a/lib/Doctrine/deploy/simpleSampleData/CertStatusChanges.xml b/lib/Doctrine/deploy/simpleSampleData/CertStatusChanges.xml
deleted file mode 100644
index 5be1583ba..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/CertStatusChanges.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-    <result>
-        <UNIX_TIME>1262304001</UNIX_TIME>
-        <SITE>SITE_1</SITE>
-        <OLD_STATUS>Uncertified</OLD_STATUS>
-        <NEW_STATUS>Certified</NEW_STATUS>
-        <CHANGED_BY>/CN=SOME CN</CHANGED_BY>
-        <COMMENT>Record of a change of status</COMMENT>
-    </result>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/CertStatusDate.xml b/lib/Doctrine/deploy/simpleSampleData/CertStatusDate.xml
deleted file mode 100644
index cd427ac2a..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/CertStatusDate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-    <site>
-        <name>SITE_1</name>
-        <cert_status>Certified</cert_status>
-        <cert_date>01-JAN-10 00.00.01 AM</cert_date>
-    </site>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/NGIs.xml b/lib/Doctrine/deploy/simpleSampleData/NGIs.xml
deleted file mode 100644
index f29e8f9a7..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/NGIs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-  <NGI>
-    <NAME>NGI-1</NAME>
-    <DESCRIPTION>A sample NGI</DESCRIPTION>
-    <EMAIL>ngi-contact@ngi-1.org</EMAIL>
-    <SECURITY_EMAIL>ngi-1-security@ngi-1.org</SECURITY_EMAIL>
-  </NGI>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/Scopes.xml b/lib/Doctrine/deploy/simpleSampleData/Scopes.xml
deleted file mode 100644
index 80b16439f..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/Scopes.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Required tag seed data for scoping Sites and SEs -->
-<results>
-    <tag grid_id="0">
-        <name key="primary">Local</name>
-    </tag>
-    <tag grid_id="0">
-        <name key="primary">EGI</name>
-    </tag>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/ServiceEndpoints.xml b/lib/Doctrine/deploy/simpleSampleData/ServiceEndpoints.xml
deleted file mode 100644
index d1fb8f9d5..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/ServiceEndpoints.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-    <SERVICE_ENDPOINT PRIMARY_KEY="44657G0">
-        <SITENAME>SITE-1</SITENAME>
-        <HOSTNAME>service-1.site-1.org</HOSTNAME>
-        <SERVICE_TYPE>CE</SERVICE_TYPE>
-        <IN_PRODUCTION>Y</IN_PRODUCTION>
-        <NODE_MONITORED>Y</NODE_MONITORED>
-        <SCOPE>Local</SCOPE>
-        <HOSTDN>/DC=org/DC=site-1/CN=service-1.site-1.org</HOSTDN>
-        <HOST_IP>127.0.0.01</HOST_IP>
-        <HOST_OS>SL5</HOST_OS>
-        <HOST_ARCH>64 bit</HOST_ARCH>
-        <DESCRIPTION>A service on Site 1</DESCRIPTION>
-
-        <URL></URL>
-        <!--
-        <PRIMARY_KEY>44657G0</PRIMARY_KEY>
-        <GOCDB_PORTAL_URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&amp;object_id=26149&amp;grid_id=0</GOCDB_PORTAL_URL>
-        <BETA>N</BETA>
-        <CORE></CORE>
-        <COUNTRY_NAME>Switzerland</COUNTRY_NAME>
-        <COUNTRY_CODE>CH</COUNTRY_CODE>
-        <ROC_NAME>NGI_CH</ROC_NAME> -->
-    </SERVICE_ENDPOINT>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/ServiceGroups.xml b/lib/Doctrine/deploy/simpleSampleData/ServiceGroups.xml
deleted file mode 100644
index 22d04513e..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/ServiceGroups.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-  <SERVICE_GROUP>
-    <NAME>Group1_Services</NAME>
-    <DESCRIPTION>A test service group</DESCRIPTION>
-    <MONITORED>Y</MONITORED>
-    <CONTACT_EMAIL>contact@site-1.org</CONTACT_EMAIL>
-    <SCOPE>Local</SCOPE>
-    <!--
-      <SERVICE_ENDPOINT>
-      <HOSTNAME>service-1.site-1.org</HOSTNAME>
-      <SERVICE_TYPE>CE</SERVICE_TYPE>
-      <HOST_IP>127.0.0.01</HOST_IP>
-      <IN_PRODUCTION>Y</IN_PRODUCTION>
-      <NODE_MONITORED>Y</NODE_MONITORED>
-    </SERVICE_ENDPOINT>
-    -->
-  </SERVICE_GROUP>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/Sites.xml b/lib/Doctrine/deploy/simpleSampleData/Sites.xml
deleted file mode 100644
index e99e04048..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/Sites.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-  <SITE>
-    <PRIMARY_KEY>SITE-PK-1</PRIMARY_KEY>
-    <SHORT_NAME>SITE-1</SHORT_NAME>
-    <OFFICIAL_NAME>SITE NUMBER 1</OFFICIAL_NAME>
-    <SITE_DESCRIPTION>Test site description for Site 1.</SITE_DESCRIPTION>
-    <HOME_URL>http://www.site-1.org/</HOME_URL>
-    <CONTACT_EMAIL>contact@site-1.org</CONTACT_EMAIL>
-    <CSIRT_EMAIL>csirt@site-1.org</CSIRT_EMAIL>
-    <CONTACT_TEL>+12 34 5678 01</CONTACT_TEL>
-    <COUNTRY_CODE>DK</COUNTRY_CODE>
-    <COUNTRY>Denmark</COUNTRY>
-    <ROC>NGI-1</ROC>
-    <PRODUCTION_INFRASTRUCTURE>Test</PRODUCTION_INFRASTRUCTURE>
-    <CERTIFICATION_STATUS>Certified</CERTIFICATION_STATUS>
-    <TIMEZONE>Europe/Zurich</TIMEZONE>
-    <IP_RANGE>127.0.0.1/127.0.0.99</IP_RANGE>
-    <CSIRTTEL>+12 34 5678 02</CSIRTTEL>
-    <EMERGENCYTEL>+12 34 5678 03</EMERGENCYTEL>
-    <SCOPE>EGI</SCOPE>
-    <DOMAIN>
-      <DOMAIN_NAME>site-1.org</DOMAIN_NAME>
-    </DOMAIN>
-    <LONGITUDE>-06.47</LONGITUDE>
-    <LATITUDE>62.00</LATITUDE>
-  </SITE>
-</results>
diff --git a/lib/Doctrine/deploy/simpleSampleData/UsersAndRoles.xml b/lib/Doctrine/deploy/simpleSampleData/UsersAndRoles.xml
deleted file mode 100644
index b1ed7d386..000000000
--- a/lib/Doctrine/deploy/simpleSampleData/UsersAndRoles.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<results>
-    <EGEE_USER>
-        <FORENAME>Alpha</FORENAME>
-        <SURNAME>Beta</SURNAME>
-        <TITLE></TITLE>
-        <EMAIL>alpha.beta@beta.com</EMAIL>
-        <TEL>+01 2345 67 0000</TEL>
-        <WORKING_HOURS_START></WORKING_HOURS_START>
-        <WORKING_HOURS_END></WORKING_HOURS_END>
-        <CERTDN>/CN=Alpha Beta</CERTDN>
-        <APPROVED></APPROVED>
-        <ACTIVE></ACTIVE>
-        <HOMESITE>SITE-1</HOMESITE>
-        <USER_ROLE>
-            <USER_ROLE>Site Administrator</USER_ROLE>
-            <ON_ENTITY>SITE-1</ON_ENTITY>
-            <ENTITY_TYPE>site</ENTITY_TYPE>
-        </USER_ROLE>
-        <USER_ROLE>
-            <USER_ROLE>Regional Staff (ROD)</USER_ROLE>
-            <ON_ENTITY>NGI-1</ON_ENTITY>
-            <ENTITY_TYPE>group</ENTITY_TYPE>
-        </USER_ROLE>
-        <USER_ROLE>
-            <USER_ROLE>COD Staff</USER_ROLE>
-            <ON_ENTITY>EGI</ON_ENTITY>
-            <ENTITY_TYPE>group</ENTITY_TYPE>
-        </USER_ROLE>
-    </EGEE_USER>
-</results>