Clean-up debug handlers