===> Cleaning for knock-0.8