Cosmetic rework of map. still useless do.