Patch done!  Remove duplication handler stuff