Remove TODO (as Nicolas C. asked)