cleaning up todos
Cleaning up coordinator code