Cleanup. Add todo.

Authored by krop on Nov 13 2017, 6:51 PM.