Clean up some old TODOs, remove unused class.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>