cleanup according to new KCL