===> Cleaning for bat-0.21.0