Index: trunk/build/quickstart-build.xml
===================================================================
--- trunk/build/quickstart-build.xml (revision 1565)
+++ trunk/build/quickstart-build.xml (revision 1581)
@@ -79,7 +79,5 @@
     <property file="${org.bedework.user.build.properties}" />
 
-    <property file="${basedir}/bedework/deployment/deploy.properties" />
-
-    <!-- Unfortuanately it sits on top of everything
+    <!-- Unfortunately it sits on top of everything
     <splash imageurl="file://${org.bedework.project.bedework}/docs/icons/bedeworkLogo.gif"/>
     -->
Index: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties (revision 1580)
+++ trunk/config/configs/democal.properties (revision 1581)
@@ -124,7 +124,4 @@
 # ------------------------------------------------------------------------
 #
-# Name of the default quickstart configuration.
-org.bedework.clone.default=democal
-
 # ------------------------------------------------------------------------
 # hsqldb defs
Index: trunk/deployment/build.xml
===================================================================
--- trunk/deployment/build.xml (revision 1580)
+++ trunk/deployment/build.xml (revision 1581)
@@ -41,9 +41,8 @@
 
     <!-- ==================== config properties ========================= -->
-    <property name="org.bedework.clone.name" value="${org.bedework.clone.default}" />
     <property name="org.bedework.config.properties"
-              location="${org.bedework.config.base}/configs/${org.bedework.clone.name}.properties" />
+              location="${org.bedework.config.base}/configs/democal.properties" />
     <property name="org.bedework.config.options"
-              location="${org.bedework.config.base}/configs/${org.bedework.clone.name}.options.xml" />
+              location="${org.bedework.config.base}/configs/democal.options.xml" />
 
     <echo message="==========================================================" />
Index: trunk/deployment/deploy.properties
===================================================================
--- trunk/deployment/deploy.properties (revision 997)
+++  (revision )
@@ -1,61 +1,0 @@
-#
-#    bedework calendar default deployment definitions.
-#    This file is imported by the deployment build files
-#
-#    ************** Do not configure by editing this or any other quickstart file
-#    The only site configuration changes should be
-#    made by creating a bedework.build.properties file in your home
-#    directory and setting property overrides there.
-#
-#    See the documentation in the docs directory for details.
-#
-
-# Name of the default quickstart configuration.
-org.bedework.clone.default=democal
-
-# ------------------------------------------------------------------------
-# hsqldb defs
-# ------------------------------------------------------------------------
-
-#  where the default db is
-org.bedework.hsqldb.dir=${org.bedework.project.bedework}/../hsqldb-1.7.3.3
-
-#  hsqldb db name for bedework.
-org.bedework.hsqldb.dbname=demo/events
-
-#  If uPortal2 builds are enabled this is where the default dbname
-org.bedework.hsqldb.uportal2.dbname=uportal2/uportal
-
-#  default db name for tests
-org.bedework.hsqldb.test.dbdir=test
-
-# ------------------------------------------------------------------------
-# Application server defs
-# ------------------------------------------------------------------------
-
-#  where the application server lives
-#org.bedework.appserver.dir=${org.bedework.project.bedework}/../jakarta-tomcat-5.0.28
-org.bedework.appserver.dir=${org.bedework.project.bedework}/../apache-tomcat-5.5.17
-
-#  where we deploy
-org.bedework.appserver.deploy.dir=${org.bedework.appserver.dir}/webapps
-
-#  where most library files used by all applications go
-appserver.lib.dir=${org.bedework.appserver.dir}/common/lib
-
-#w  here 'endorsed' library files go.  These classes override anything
-#  the JVM has.  This is particularly important for things like Xalan,
-#  etc., which can break the application if you choose the wrong version
-appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed
-
-#  where things like log4j config files go
-log4j.config.destination=${org.bedework.appserver.dir}/common/classes
-
-#  the toplevel directory for the default web application
-webapp.root.dir=${org.bedework.appserver.deploy.dir}/ROOT
-
-#  If jetspeed2 builds are enabled this is where we deploy
-org.bedework.jetspeed2.deploy.dir=${org.bedework.appserver.deploy.dir}/jetspeed/WEB-INF/deploy
-
-#  Set to yes if you want your log4j.xml overwritten
-org.bedework.deploy.log4j.config=no