More build.xml cleanup