===> Cleaning for bat-0.25.0