Now that we have addControl and removeControl on the map we should use that instead of setMap.