Deleted unneeded extra handler