Remove hashmap from runmap implementation