Cleaned up remaining todos.