change some maps and remove some unused settings