add mapping and delete unused