minor map cleanup