ant task fixes and cleanup