Mob 1532 delete map

@rogatty @RafLeszczynski @nandy-andy