===> Cleaning for bkt-0.7.1