remove udnerscore untilwe found how to deal with underscore map