cleanup according to new KMF