Forgot to clear TODO comment