Remove handler could be singleton