Cleaning up build.xml