Cleanup MapsSpec with smaller props