===> Cleaning for bat-0.26.0