Inproper map layer removal fix