===> Cleaning for knc-1.7.1