Minor cleanup
ant build bug fixed