removing unnecessary functions
remove unnecassary mappings