remove warnings from map too