TODO comment is done, so comment should be removed?