Simplify breakpoint removal
Issue #26