Breakpoint architecture clean-up