Cleanup

Few modifications to the Ant build files and properties.