Remove TODO (because it's done)