Further cleaned up Ant build.xml