Remove KV* inheritance
Closes T125