updated remaps to remove trailing comments