cleanup accroding to new KMF