Refactored DisambiguationUnit.resolve.
Moved DisambiguationUnit.resolve to Disambiguator, removed empty DisambiguationUnit class.
Refactored DisambiguationUnit.resolve. Removed unused code.