more cleanup of build.xml