Dedupe refactor

refactor class as part of IPLAYER-18662