Cleanup of collector handlers