Can you remove this TODO comment while changing the comments