map shapes modified, map copy cleaned up