Remove the TODO mark fixed by the previous commit