cleanup event for next generaiton of KMF events
add test