===> Cleaning for bat-0.15.0