Forgot to remove the TODO comment last commit