Renove comments map

2017