Remove internal data map, need to think about it