Romoving duplicated handler