Remove not needed handler