Cleaned up build.xml