dev

- Minor refactoring
- Timer to remove from RT channel