diff --git a/demos/gvr/src/main/AndroidManifest.xml b/demos/gvr/src/main/AndroidManifest.xml
index d582433471..ccdcae9cae 100644
--- a/demos/gvr/src/main/AndroidManifest.xml
+++ b/demos/gvr/src/main/AndroidManifest.xml
@@ -36,29 +36,15 @@
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data android:scheme="http"/>
-        <data android:scheme="https"/>
-        <data android:scheme="content"/>
-        <data android:scheme="asset"/>
-        <data android:scheme="file"/>
-        <data android:host="*"/>
-        <data android:pathPattern=".*\\.exolist\\.json"/>
-      </intent-filter>
     </activity>
 
     <activity
         android:name="com.google.android.exoplayer2.gvrdemo.PlayerActivity"
         android:configChanges="density|keyboardHidden|navigation|orientation|screenSize|uiMode"
-        android:enableVrMode="@string/gvr_vr_mode_component"
         android:exported="false"
         android:label="@string/application_name"
         android:launchMode="singleTask"
+        android:enableVrMode="@string/gvr_vr_mode_component"
         android:resizeableActivity="false"
         android:screenOrientation="landscape"
         android:theme="@style/VrActivityTheme">
diff --git a/demos/gvr/src/main/java/com/google/android/exoplayer2/gvrdemo/SampleChooserActivity.java b/demos/gvr/src/main/java/com/google/android/exoplayer2/gvrdemo/SampleChooserActivity.java
index 1ddf5c1517..0694f072ee 100644
--- a/demos/gvr/src/main/java/com/google/android/exoplayer2/gvrdemo/SampleChooserActivity.java
+++ b/demos/gvr/src/main/java/com/google/android/exoplayer2/gvrdemo/SampleChooserActivity.java
@@ -44,47 +44,6 @@ public class SampleChooserActivity extends Activity {
             "Iceland (360 top-bottom stereo ts)",
             "https://storage.googleapis.com/exoplayer-test-media-1/360/iceland0.ts",
             SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "Camera motion metadata test",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/synthetic_with_camm.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "actual_camera_cat",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/actual_camera_cat.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "johnny_stitched",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/johnny_stitched.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "lenovo_birds.vr",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/lenovo_birds.vr.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "mono_v1_sample",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/mono_v1_sample.mp4",
-            SPHERICAL_STEREO_MODE_MONO),
-        new Sample(
-            "not_vr180_actually_shot_with_moto_mod",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/"
-                + "not_vr180_actually_shot_with_moto_mod.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "stereo_v1_sample",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/stereo_v1_sample.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
-        new Sample(
-            "yi_giraffes.vr",
-            "https://storage.googleapis.com/exoplayer-test-media-internal-"
-                + "63834241aced7884c2544af1a3452e01/vr180/yi_giraffes.vr.mp4",
-            SPHERICAL_STEREO_MODE_TOP_BOTTOM),
       };
 
   @Override