remove KeyValue stuff