diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1318cd0f..48f6b400 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
+        android:largeHeap="true"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
diff --git a/src/com/limelight/nvstream/NvVideoStream.java b/src/com/limelight/nvstream/NvVideoStream.java
index 004f8fa5..2b9754cf 100644
--- a/src/com/limelight/nvstream/NvVideoStream.java
+++ b/src/com/limelight/nvstream/NvVideoStream.java
@@ -20,7 +20,6 @@ import com.limelight.nvstream.av.video.AvVideoPacket;
 import jlibrtp.Participant;
 import jlibrtp.RTPSession;
 
-import android.content.ComponentCallbacks2;
 import android.media.MediaCodec;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaFormat;