[TASK]Added device type differentiation in breakpoints. And cleanup.