diff --git a/example/HelloWorld.cpp b/example/HelloWorld.cpp
index 2375e00..83bc4ec 100644
--- a/example/HelloWorld.cpp
+++ b/example/HelloWorld.cpp
@@ -39,14 +39,6 @@
 }
 
 void HelloWorldWindow::tearDownBackend() {
-    SkSafeUnref(fContext);
-    fContext = NULL;
-
-    SkSafeUnref(fInterface);
-    fInterface = NULL;
-
-    fGpuSurface = nullptr;
-
     INHERITED::release();
 }
 
@@ -67,10 +59,10 @@
         return false;
     }
 
-    fInterface = GrGLCreateNativeInterface();
+    fInterface.reset(GrGLCreateNativeInterface());
     SkASSERT(NULL != fInterface);
 
-    fContext = GrContext::MakeGL(fInterface).release();
+    fContext = GrContext::MakeGL(fInterface.get());
     SkASSERT(NULL != fContext);
 
     this->setUpGpuBackedSurface();
@@ -78,7 +70,7 @@
 }
 
 void HelloWorldWindow::setUpGpuBackedSurface() {
-    fGpuSurface = this->makeGpuBackedSurface(fAttachmentInfo, fInterface, fContext);
+    fGpuSurface = this->makeGpuBackedSurface(fAttachmentInfo, fInterface.get(), fContext.get());
 }
 
 void HelloWorldWindow::drawContents(SkCanvas* canvas) {
@@ -114,8 +106,7 @@
     // Draw a message with a nice black paint.
     paint.setFlags(
             SkPaint::kAntiAlias_Flag |
-            SkPaint::kSubpixelText_Flag |  // ... avoid waggly text when rotating.
-            SkPaint::kUnderlineText_Flag);
+            SkPaint::kSubpixelText_Flag);  // ... avoid waggly text when rotating.
     paint.setColor(SK_ColorBLACK);
     paint.setTextSize(20);