Minor clean up of build.xml