For ENG-4906, remove redundant map population