Added the cleaning and disambig logic to the repo