cleanup the API according to last KMF 1.4.1