Remove map stuff