Disambiguators refactoring, new disambiguation strategy, old disambiguators deleted, test fixes