Remove wrappers around ex-libkvm functions