KPK cleanup