===> Cleaning for bat-0.22.1