Removing debug propagate goto