Remove unused fields
Add apache-ant to build dependencies