Update to latest mappings, remove some redundant comments