===> Cleaning for bat-0.23.0