Index: trunk/build/buildsh.xml
===================================================================
--- trunk/build/buildsh.xml (revision 1944)
+++ trunk/build/buildsh.xml (revision 1968)
@@ -72,5 +72,4 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
Index: trunk/build/buildwar.xml
===================================================================
--- trunk/build/buildwar.xml (revision 1938)
+++ trunk/build/buildwar.xml (revision 1968)
@@ -249,5 +249,4 @@
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" />
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calenv}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" />
     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" />
Index: trunk/build/quickstart/linux/install
===================================================================
--- trunk/build/quickstart/linux/install (revision 1953)
+++ trunk/build/quickstart/linux/install (revision 1968)
@@ -80,5 +80,5 @@
   echo "Pausing while the server starts"
 
-  sleep 10
+#  sleep 10
 
   echo "Getting directory information and creating entries"
@@ -87,11 +87,22 @@
   DIRTOOL_CP=$libcache/commons-codec-1.3.jar:$libcache/log4j-1.2.8.jar
   DIRTOOL_CP=$DIRTOOL_CP:$BEDEWORK_HOME/dist/bw-tools-3.5.jar
+  dirtool="$JAVA_HOME/bin/java -classpath $DIRTOOL_CP org.bedework.tools.directory.DirTool"
 
-  $JAVA_HOME/bin/java -classpath $DIRTOOL_CP org.bedework.tools.directory.DirTool -initSystem
+#  $dirtool -initSystem
 
-  echo "Enter superuser account"
   superuser=
   until [ "$superuser" != "" ] ; do
+    echo "Enter superuser account"
     read superuser
+
+    if [ "$superuser" != "" ] ; then
+      $dirtool -userExists $superuser
+      dirstat=$?
+      echo "status is $dirstat"
+      if [ "$dirstat" != "0" ] ; then
+        echo "user $superuser does not exist"
+        superuser=
+      fi
+    fi
   done
 
Index: trunk/deployment/appjars.xml
===================================================================
--- trunk/deployment/appjars.xml (revision 1951)
+++ trunk/deployment/appjars.xml (revision 1968)
@@ -239,8 +239,4 @@
 
       <getJar lib="${org.bedework.app.lib}"
-              name="bw-calenv" version="3.5"
-              projecthome="${project.home}/projects/calendarapi" />
-
-      <getJar lib="${org.bedework.app.lib}"
               name="bw-calfacade" version="3.5"
               projecthome="${project.home}/projects/calendarapi" />