Merge "[KV] Refactor clean-up"