Refined storepkm, added remove_pkm overload