===> Cleaning for bk-0.6.0