Clean up some todo comments.