removed serverMap