Cleaned out some todos.