remove map_store dependency