Clean up and reverted changes not related to conffiles
Added support for ant