Add a helpful comment
Remove TODO comment