Using more of kvapi and cleanup