Removing TODO since it's no longer valid.