Query on KVS
Cleanup