fixed declarations for removing breakpoints