CFY-287 removed kv-store