SWITCHYARD-2482 cleanup debugger issues