Cleanup to use NoNError.