Remove map, tweak copy