Remove the useless handler function