Index: unix_installer/installer-package/ant-scripts/configure-database.xml
===================================================================
diff -u -rcc710833ade4bf7f1e85cb7c43b5f8a5c44e2860 -r8b4a85f27e891cc3b0dfbd2c38fd910017f08ffb
--- unix_installer/installer-package/ant-scripts/configure-database.xml	(.../configure-database.xml)	(revision cc710833ade4bf7f1e85cb7c43b5f8a5c44e2860)
+++ unix_installer/installer-package/ant-scripts/configure-database.xml	(.../configure-database.xml)	(revision 8b4a85f27e891cc3b0dfbd2c38fd910017f08ffb)
@@ -39,6 +39,7 @@
                         encoding="utf8"
                         onerror="continue">
                         <transaction src="../database/dump.sql" />
+						<transaction src="../sql-scripts/removeConfigs.sql"/>
                         <transaction src="../sql-scripts/setLamsConfiguration.sql"/>
                 </sql>
 	</target>
Index: unix_installer/installer-package/sql-scripts/removeConfigs.sql
===================================================================
diff -u
--- unix_installer/installer-package/sql-scripts/removeConfigs.sql	(revision 0)
+++ unix_installer/installer-package/sql-scripts/removeConfigs.sql	(revision 8b4a85f27e891cc3b0dfbd2c38fd910017f08ffb)
@@ -0,0 +1,14 @@
+-- This file removes any configs left by the dump so the dump can be used
+-- directly without the need to remove anything (apart from unused users)
+
+-- Remove configs 
+update lams_configuration set config_value="" where config_key="STMPServer";
+update lams_configuration set config_value="" where config_key="XmppPassword";
+update lams_configuration set config_value="ldap://192.158.1.1" where config_key="LDAPProvierURL";
+
+-- From 2.2 onwards. Remove gmap key
+update tl_lagmap10_configuration set config_value="" where config_key="GmapKey";
+
+-- From 2.2 onwards. Ensure spreadsheet is set to disabled
+update lams_learning_library set valid_flag=0 where title="SpreadSheet";
+