Removed todo.
Code clean up.