CD-2
- scheduler remove was not carrying over the state map