Forgot to remove an import and a TODO