removed unnecessary  mappings