modify comments and remove some unused mapping