removed kvs dependency