removed map data structs