removing unnecessary functions and mappings