Remove unnecessary setting
Change some mapping