Removed global map variable