Copy remove_handler from yummin