Cleaned up most todos.