added clearing of mappings