try to remove KeyValue struct