removed unnecessary handler