Remove cruft; update build.xml