(Refactor) Remove duplicates!