===> Cleaning for bat-0.12.0