Remove Breakpoint dependency