Remove TODOs (e.g. JdbcDataStore: // TODO: Call TaskManager to kill all tasks)
Merged