Forgot to remove the TODO