diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
index 9a2b76c941..2894bb8e5f 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -30,7 +30,6 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ui.PlaybackControlView;
 import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
-import com.google.android.exoplayer2.util.Util;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 
 /**
@@ -69,36 +68,17 @@ public class MainActivity extends AppCompatActivity {
     return true;
   }
 
-  @Override
-  public void onStart() {
-    super.onStart();
-    if (Util.SDK_INT > 23) {
-      setupPlayerManager();
-    }
-  }
-
   @Override
   public void onResume() {
     super.onResume();
-    if ((Util.SDK_INT <= 23)) {
-      setupPlayerManager();
-    }
+    playerManager = new PlayerManager(simpleExoPlayerView, castControlView, this);
   }
 
   @Override
   public void onPause() {
     super.onPause();
-    if (Util.SDK_INT <= 23) {
-      releasePlayerManager();
-    }
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    if (Util.SDK_INT > 23) {
-      releasePlayerManager();
-    }
+    playerManager.release();
+    playerManager = null;
   }
 
   // Activity input.
@@ -109,18 +89,6 @@ public class MainActivity extends AppCompatActivity {
     return super.dispatchKeyEvent(event) || playerManager.dispatchKeyEvent(event);
   }
 
-  // Internal methods.
-
-  private void setupPlayerManager() {
-    playerManager = new PlayerManager(simpleExoPlayerView, castControlView,
-        getApplicationContext());
-  }
-
-  private void releasePlayerManager() {
-    playerManager.release();
-    playerManager = null;
-  }
-
   // User controls.
 
   private final class SampleListAdapter extends ArrayAdapter<CastDemoUtil.Sample> {