Clean up handlers