Removed old breakpoints and comments