===> Cleaning for knc-1.6.1