Simplify temp breakpoint cleanup