Added a todo.
Removed two unused functions.