Refactoring
Finished interactive removal of duplicates