cleanup, including edits to build.xml files