diff --git a/Ant-Clean.xml b/Ant-Clean.xml
deleted file mode 100644
index b15cb6f1..00000000
--- a/Ant-Clean.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<project>
-
-  <description>
-    For this file to be included in all build.xml files
-    at all directory levels, the single entries with the
-    "**/" syntax must be used everywhere.
-  </description>
-
-  <target name="clean" description="delete all byproducts" >
-    <delete>
-      <fileset dir="${basedir}" casesensitive="yes">
-        <include name="**/*.class" />
-        <include name="**/*.txt" />
-        <include name="**/*.tmp" />
-        <include name="**/*.xml" />
-        <include name="**/*.out" />
-        <include name="**/*.err" />
-        <include name="**/*.dat" />
-        <include name="**/*.log" />
-        <include name="**/*.serialized" />
-        <include name="**/failures" />
-        <include name="**/test.gz" />
-        <include name="**/test.zip" />
-        <include name="**/X.file" />
-        <exclude name=".idea/"/>
-        <exclude name="*.iml"/>
-        <exclude name="**/*.java"/>
-        <exclude name="**/Copyright.txt" />
-        <exclude name="**/Face*.gif"/>
-        <exclude name="**/build.xml"/>
-        <exclude name="**/Ant-Common.xml" />
-        <exclude name="**/Ant-Clean.xml" />
-        <exclude name="**/run.bat" />
-        <exclude name="**/*.py" />
-        <exclude name="**/*.cpp" />
-        <exclude name="**/VendingMachineInput.txt" />
-        <exclude name="**/Trash.dat" />
-        <exclude name="**/Cheese.dat" />
-        <exclude name="**/log.prop"/>
-        <exclude name="**/runall.ps1" />
-      </fileset>
-    </delete>
-    <echo message="clean successful"/>
-  </target>
-
-</project>
diff --git a/Ant-Common.xml b/Ant-Common.xml
deleted file mode 100644
index 43ef0b06..00000000
--- a/Ant-Common.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<project xmlns:if="ant:if" xmlns:unless="ant:unless">
-
-  <property name="chapter" value="CHAPTER?"/>
-  <property name="antoutput" value="../Ant-output.txt"/>
-
-  <description>
-    Ant build.xml for the source code for chapter ${chapter}
-    Bruce Eckel On Java
-    Code available at https://github.com/BruceEckel/OnJava-Examples
-    See installation instructions in README.md
-    See copyright notice in CopyRight.txt
-
-    Ant available from http://ant.apache.org
-
-    To see options, type: ant -p
-  </description>
-
-  <condition property="version1.8">
-    <equals arg1="1.8" arg2="${ant.java.version}"/>
-  </condition>
-
-
-  <!--===========================================================-->
-  <macrodef name="jrun">
-     <attribute name="cls" default="NOT SET"/>
-     <attribute name="dirpath" default=""/>
-     <attribute name="arguments" default=""/>
-     <attribute name="failOnError" default="true"/>
-     <attribute name="timeOut" default="15000"/>
-     <attribute name="msg" default=""/>
-     <sequential>
-        <echo>[${chapter}] java @{cls} @{arguments}&#13;</echo>
-        <echo file="${antoutput}" append="true">[${chapter}] java @{cls} @{arguments}&#13;</echo>
-        <java
-          classname="@{cls}"
-          classpath="${java.class.path};${basedir};${basedir}/.."
-          dir="@{dirpath}"
-          failonerror="@{failOnError}"
-          fork="true"
-          timeout="@{timeOut}"
-          output="${antoutput}" append="true">
-            <arg line="@{arguments}"/>
-            <redirector
-              output="@{cls}.out"
-              error="@{cls}.err"
-              createemptyfiles="false"
-              append="false" />
-        </java>
-        <echo file="${antoutput}" append="true">[${chapter}] Finished: java @{cls} @{arguments}&#13;</echo>
-        <echo file="${antoutput}" append="true">@{msg}&#13;</echo>
-        <echo file="${antoutput}" append="true">--------------------------------&#13;</echo>
-     </sequential>
-  </macrodef>
-
-
-  <!--===========================================================-->
-  <macrodef name="jrunconsole">
-     <attribute name="cls" default="NOT SET"/>
-     <attribute name="dirpath" default=""/>
-     <attribute name="arguments" default=""/>
-     <attribute name="failOnError" default="true"/>
-     <attribute name="timeOut" default="15000"/>
-     <attribute name="msg" default=""/>
-     <sequential>
-        <echo>[${chapter}] java @{cls} @{arguments}&#13;</echo>
-        <echo append="true">[${chapter}] java @{cls} @{arguments}&#13;</echo>
-        <java
-          classname="@{cls}"
-          classpath="${java.class.path};${basedir};${basedir}/.."
-          dir="@{dirpath}"
-          failonerror="@{failOnError}"
-          fork="true"
-          timeout="@{timeOut}"
-          >
-            <arg line="@{arguments}"/>
-        </java>
-        <echo append="true">[${chapter}] Finished: java @{cls} @{arguments}&#13;</echo>
-        <echo append="true">@{msg}&#13;</echo>
-        <echo append="true">--------------------------------&#13;</echo>
-     </sequential>
-  </macrodef>
-
-  <macrodef name="execscript">
-    <attribute name="name"/>
-    <sequential>
-        <condition property="isWindows">
-            <os family="windows"/>
-        </condition>
-
-        <sequential if:true="isWindows">
-            <echo message="@{name}.bat"/>
-            <exec executable="cmd" dir=".">
-                <arg line="/c @{name}.bat"/>
-            </exec>
-        </sequential>
-        <sequential unless:true="isWindows">
-            <echo message="@{name}.sh"/>
-            <exec executable="sh" dir=".">
-                <arg line="@{name}.sh"/>
-            </exec>
-        </sequential>
-    </sequential>
-  </macrodef>
-
-  <!--===========================================================-->
-  <target name="base"
-   description="Build all common dependencies">
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../onjava/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../com/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../polymorphism/music/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../typeinfo/pets/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../collections/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../generics/coffee/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     srcdir="${basedir}/../enums/menu/">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-  </target>
-
-
-  <!--===========================================================-->
-  <target name="build"
-   description="Build all classes in this directory"
-   depends="base">
-    <fail message="Java 8 required" unless="version1.8"/>
-    <echo message="Building '${chapter}'&#13;"/>
-    <echo file="${antoutput}" append="true" message="Building '${chapter}'&#13;"/>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     debug="true"
-     excludes="${excludedfiles}"
-     srcdir="${basedir}">
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <echo message="Build '${chapter}' succeeded&#13;"/>
-    <echo file="${antoutput}" append="true" message="Build '${chapter}' succeeded&#13;"/>
-  </target>
-
-
-  <!--===========================================================-->
-  <target name="buildw"
-   description="Build all classes in this directory, enabling 'Unchecked' warnings"
-   depends="base">
-    <fail message="Java 8 required" unless="version1.8"/>
-    <echo message="Building '${chapter}'&#13;"/>
-    <echo file="${antoutput}" append="true" message="Building '${chapter}'&#13;"/>
-    <javac includeantruntime="false"
-     classpath="${java.class.path};${basedir};${basedir}/.."
-     debug="true"
-     excludes="${excludedfiles}"
-     srcdir="${basedir}">
-      <compilerarg value="-Xlint:unchecked"/>
-      <compilerarg value="-Xmaxerrs"/>
-      <compilerarg value="10"/>
-    </javac>
-    <echo message="Build '${chapter}' succeeded&#13;"/>
-    <echo file="${antoutput}" append="true" message="Build '${chapter}' succeeded&#13;"/>
-  </target>
-
-  <!--===========================================================-->
-  <target name="verifyclean"
-    description="delete ant verify output files" >
-    <delete>
-      <fileset dir="${basedir}" casesensitive="yes">
-        <include name="**/update_output.bat" />
-        <include name="**/validate_failures.txt" />
-        <include name="**/validate_successes.txt" />
-        <include name="**/strategies.txt" />
-        <include name="**/edit_errors.bat" />
-      </fileset>
-    </delete>
-    <echo message="verifyclean successful"/>
-  </target>
-
-  <target name="verify"
-   description="Verify output; requires Python 3.5"
-   depends="verifyclean">
-    <exec dir="${basedir}" executable="python" failonerror="true">
-      <arg line="../verify_output.py" />
-    </exec>
-  </target>
-
-</project>
diff --git a/build.xml b/build.xml
deleted file mode 100644
index a73a1d93..00000000
--- a/build.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" ?>
-
-<project basedir="." default="run" name="Bruce Eckel On Java">
-  <import file="Ant-Clean.xml"/>
-
-  <description>
-    Main build.xml for the source code for
-    Bruce Eckel On Java
-    Code available at https://github.com/BruceEckel/OnJava-Examples
-    See installation instructions in README.md
-    See copyright notice in CopyRight.txt
-
-    Ant available from http://ant.apache.org
-
-    To see options, type: ant -p
-  </description>
-
-  <condition property="version1.8">
-    <equals arg1="1.8" arg2="${ant.java.version}"/>
-  </condition>
-
-  <filelist id="buildfiles" dir="."
-    files="objects/build.xml
-      operators/build.xml
-      control/build.xml
-      housekeeping/build.xml
-      hiding/build.xml
-      com/build.xml
-      reuse/build.xml
-      polymorphism/build.xml
-      interfaces/build.xml
-      innerclasses/build.xml
-      functional/build.xml
-      collections/build.xml
-      streams/build.xml
-      exceptions/build.xml
-      strings/build.xml
-      typeinfo/build.xml
-      generics/build.xml
-      arrays/build.xml
-      collectionsindepth/build.xml
-      files/build.xml
-      enums/build.xml
-      annotations/build.xml
-      threads/build.xml
-      patterns/build.xml
-      unittesting/build.xml
-      assertions/build.xml
-      references/build.xml
-      iostreams/build.xml
-      standardio/build.xml
-      newio/build.xml
-      compression/build.xml
-      serialization/build.xml
-      preferences/build.xml
-      network/build.xml
-      remote/build.xml
-      logging/build.xml
-      debugging/build.xml
-      staticchecking/build.xml
-      "/>
-
-  <filelist id="testablefiles" dir="."
-    description="All directories that produce auto-testable results"
-    files="objects/build.xml
-      operators/build.xml
-      control/build.xml
-      housekeeping/build.xml
-      hiding/build.xml
-      com/build.xml
-      reuse/build.xml
-      polymorphism/build.xml
-      interfaces/build.xml
-      innerclasses/build.xml
-      functional/build.xml
-      collections/build.xml
-      streams/build.xml
-      exceptions/build.xml
-      strings/build.xml
-      typeinfo/build.xml
-      generics/build.xml
-      arrays/build.xml
-      collectionsindepth/build.xml
-      files/build.xml
-      enums/build.xml
-      annotations/build.xml
-      threads/build.xml
-      patterns/build.xml
-      unittesting/build.xml
-      assertions/build.xml
-      references/build.xml
-      iostreams/build.xml
-      standardio/build.xml
-      newio/build.xml
-      compression/build.xml
-      serialization/build.xml
-      preferences/build.xml
-      logging/build.xml
-      debugging/build.xml
-      staticchecking/build.xml
-      "/>
-
-  <target name="run" description="Compiles and runs all examples">
-    <delete file="errors.txt"/>
-    <subant>
-      <filelist refid="buildfiles"/>
-    </subant>
-    <available file="errors.txt" property="errors"/>
-    <antcall target="finish"/>
-  </target>
-
-  <target name="runconsole" description="Continuous Integration version with output">
-    <delete file="errors.txt"/>
-    <subant>
-      <filelist refid="buildfiles"/>
-      <target name="runconsole" />
-    </subant>
-    <available file="errors.txt" property="errors"/>
-    <antcall target="finish"/>
-  </target>
-
-  <target name="testable" description="Compiles and runs testable examples">
-    <delete file="errors.txt"/>
-    <subant>
-      <filelist refid="testablefiles"/>
-    </subant>
-    <available file="errors.txt" property="errors"/>
-    <antcall target="finish"/>
-  </target>
-
-  <target name="build" description="Compiles all examples">
-    <fail message="Java 8 required" unless="version1.8"/>
-    <delete file="errors.txt"/>
-    <subant target="build">
-      <filelist refid="buildfiles"/>
-    </subant>
-    <available file="errors.txt" property="errors"/>
-    <antcall target="finish"/>
-  </target>
-
-  <target name="finish" if="errors">
-    <echo message="Errors occurred.  See errors.txt for information."/>
-  </target>
-
-  <target name="verifyclean"
-    description="delete ant verify output files" >
-    <delete>
-      <fileset dir="${basedir}" casesensitive="yes">
-        <include name="update_output.bat" />
-        <include name="validate_failures.txt" />
-        <include name="validate_successes.txt" />
-        <include name="strategies.txt" />
-        <include name="edit_errors.bat" />
-      </fileset>
-    </delete>
-    <echo message="verifyclean successful"/>
-  </target>
-
-  <target name="verify"
-   description="Verify output; requires Python 3.5"
-   depends="verifyclean">
-    <exec dir="${basedir}" executable="python" failonerror="true">
-      <arg line="verify_output.py" />
-    </exec>
-  </target>
-
-  <target name="findbugs" depends="build"
-    description="Runs findbugs. Must install findbugs from findbugs.sourceforge.net">
-    <exec executable="findbugs.bat">
-      <arg value="-textui"/>
-      <arg value="-sortByClass"/>
-      <arg value="-exclude"/>
-      <arg value="FindBugsFilter.xml"/>
-      <arg value="-html"/>
-      <arg value="."/>
-      <redirector output="findbugs.html"/>
-    </exec>
-  </target>
-
-  <target name="findbugs-plain" depends="build"
-    description="Runs findbugs with plain text output">
-    <exec executable="findbugs.bat">
-      <arg value="-textui"/>
-      <arg value="-sortByClass"/>
-      <arg value="-exclude"/>
-      <arg value="FindBugsFilter.xml"/>
-      <arg value="."/>
-      <redirector output="findbugs.txt"/>
-    </exec>
-  </target>
-
-  <target name="findbugs-xml" depends="build"
-    description="Runs findbugs with xml output">
-    <exec executable="findbugs.bat">
-      <arg value="-textui"/>
-      <arg value="-sortByClass"/>
-      <arg value="-exclude"/>
-      <arg value="FindBugsFilter.xml"/>
-      <arg value="-xml"/>
-      <arg value="."/>
-      <redirector output="findbugs.xml"/>
-    </exec>
-  </target>
-
-</project>
diff --git a/collections/MapOfList.java b/collections/MapOfList.java
index c4ea6f0e..c6dfd5ce 100644
--- a/collections/MapOfList.java
+++ b/collections/MapOfList.java
@@ -2,6 +2,7 @@
 // (c)2016 MindView LLC: see Copyright.txt
 // We make no guarantees that this code is fit for any purpose.
 // Visit http://mindviewinc.com/Books/OnJava/ for more book information.
+// {main: collections.MapOfList}
 package collections;
 import typeinfo.pets.*;
 import java.util.*;
diff --git a/network/ChatterServer.bat b/network/ChatterServer.bat
deleted file mode 100644
index ef7fe486..00000000
--- a/network/ChatterServer.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-start java ChatterServer
-timeout /t 1
-java ChatterClient
diff --git a/network/ChatterServer.sh b/network/ChatterServer.sh
deleted file mode 100644
index 5c867bea..00000000
--- a/network/ChatterServer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java -cp ..:. ChatterServer &
-sleep 1
-java -cp ..:. ChatterClient
diff --git a/network/MultiSimpleServer.bat b/network/MultiSimpleServer.bat
deleted file mode 100644
index 4d20bd01..00000000
--- a/network/MultiSimpleServer.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-start java MultiSimpleServer
-timeout /t 1
-java MultiSimpleClient
diff --git a/network/MultiSimpleServer.sh b/network/MultiSimpleServer.sh
deleted file mode 100644
index deeb4b0a..00000000
--- a/network/MultiSimpleServer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java -cp ..:. MultiSimpleServer &
-sleep 1
-java -cp ..:. MultiSimpleClient
diff --git a/network/SimpleServer.bat b/network/SimpleServer.bat
deleted file mode 100644
index 095c330a..00000000
--- a/network/SimpleServer.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-start java SimpleServer
-java SimpleClient
diff --git a/network/SimpleServer.sh b/network/SimpleServer.sh
deleted file mode 100644
index 2c1335c7..00000000
--- a/network/SimpleServer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java SimpleServer &
-sleep 1
-java SimpleClient
diff --git a/network/build.xml b/network/build.xml
deleted file mode 100644
index 122ab6dc..00000000
--- a/network/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-
-<project default="run">
-  <property name="chapter" value="network"/>
-  <property name="excludedfiles" value=""/>
-
-  <import file="../Ant-Common.xml"/>
-  <import file="../Ant-Clean.xml"/>
-
-  <target name="run" description="Compile and run" depends="build">
-    <jrun cls="LocalHost" />
-    <jrun cls="WhoAmI" />
-    <execscript name="SimpleServer"/>
-    <execscript name="ChatterServer"/>
-    <execscript name="MultiSimpleServer"/>
-  </target>
-
-</project>
diff --git a/remote/build.xml b/remote/build.xml
deleted file mode 100644
index 9f712d38..00000000
--- a/remote/build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-
-<project default="run">
-  <property name="chapter" value="remote"/>
-  <property name="excludedfiles" value=""/>
-  <import file="../Ant-Common.xml"/>
-  <import file="../Ant-Clean.xml"/>
-
-  <target name="run" description="Compile and run" depends="build">
-    <execscript name="go"/>
-  </target>
-
-</project>
diff --git a/remote/go.bat b/remote/go.bat
deleted file mode 100644
index ac6f4c63..00000000
--- a/remote/go.bat
+++ /dev/null
@@ -1 +0,0 @@
-start "ptime.bat" ptime.bat
diff --git a/remote/go.sh b/remote/go.sh
deleted file mode 100644
index fdff7366..00000000
--- a/remote/go.sh
+++ /dev/null
@@ -1 +0,0 @@
-sh ptime.sh
diff --git a/remote/ptime.bat b/remote/ptime.bat
deleted file mode 100644
index aee99dbf..00000000
--- a/remote/ptime.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-start /min "registry.bat" registry.bat 3
-start /min "server.bat" server.bat 3
-timeout /t 1
-java DisplayPerfectTime
-timeout /t 3
-exit
\ No newline at end of file
diff --git a/remote/ptime.sh b/remote/ptime.sh
deleted file mode 100644
index 937264fd..00000000
--- a/remote/ptime.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-sh registry.sh 3 &
-sleep 1
-sh server.sh 3 &
-sleep 1
-java DisplayPerfectTime
diff --git a/remote/registry.bat b/remote/registry.bat
deleted file mode 100644
index ddb22c41..00000000
--- a/remote/registry.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-start /min "rmiregistry" rmiregistry
-timeout /t %1
-taskkill /im rmiregistry.exe
-exit
\ No newline at end of file
diff --git a/remote/registry.sh b/remote/registry.sh
deleted file mode 100644
index ec2ba67e..00000000
--- a/remote/registry.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-rmiregistry &
-sleep $1
-killall rmiregistry
diff --git a/remote/server.bat b/remote/server.bat
deleted file mode 100644
index 119f5255..00000000
--- a/remote/server.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-start /min "PerfectTimeServer" java PerfectTimeServer
-timeout /t %1
-taskkill /im java.exe
-exit
\ No newline at end of file
diff --git a/remote/server.sh b/remote/server.sh
deleted file mode 100644
index 1149bf92..00000000
--- a/remote/server.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-java PerfectTimeServer &
-sleep $1
-pkill -f 'java PerfectTimeServer'
\ No newline at end of file