diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 423a54d0d..6f8efe69b 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -206,8 +206,6 @@
             android:name=".assistant.RemoteConfigurationAssistantActivity"/>
         <activity
             android:name=".assistant.EchoCancellerCalibrationAssistantActivity"/>
-        <activity
-            android:name=".assistant.OpenH264DownloadAssistantActivity"/>
 
 
         <!-- Services -->
diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index 157fd24cc..2ba4f338d 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -39,11 +39,7 @@ import android.telephony.TelephonyManager;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
-import java.io.File;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
+
 import org.linphone.assistant.PhoneAccountLinkingAssistantActivity;
 import org.linphone.call.AndroidAudioManager;
 import org.linphone.call.CallManager;
@@ -65,13 +61,18 @@ import org.linphone.core.Reason;
 import org.linphone.core.Tunnel;
 import org.linphone.core.TunnelConfig;
 import org.linphone.core.VersionUpdateCheckResult;
-import org.linphone.core.tools.H264Helper;
 import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.utils.LinphoneUtils;
 import org.linphone.utils.MediaScanner;
 import org.linphone.utils.PushNotificationUtils;
 
+import java.io.File;
+import java.sql.Timestamp;
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
 /** Handles Linphone's Core lifecycle */
 public class LinphoneManager implements SensorEventListener {
     private final String mBasePath;
@@ -443,9 +444,6 @@ public class LinphoneManager implements SensorEventListener {
         } catch (Exception e) {
             Log.e(e, "[Manager] Cannot start linphone");
         }
-
-        // H264 codec Management - set to auto mode -> MediaCodec >= android 5.0 >= OpenH264
-        H264Helper.setH264Mode(H264Helper.MODE_AUTO, mCore);
     }
 
     private synchronized void configureCore() {
diff --git a/app/src/main/java/org/linphone/assistant/OpenH264DownloadAssistantActivity.java b/app/src/main/java/org/linphone/assistant/OpenH264DownloadAssistantActivity.java
deleted file mode 100644
index b2b38ecc5..000000000
--- a/app/src/main/java/org/linphone/assistant/OpenH264DownloadAssistantActivity.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2010-2019 Belledonne Communications SARL.
- *
- * This file is part of linphone-android
- * (see https://www.linphone.org).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.linphone.assistant;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import androidx.annotation.Nullable;
-import org.linphone.LinphoneManager;
-import org.linphone.R;
-import org.linphone.core.Core;
-import org.linphone.core.Factory;
-import org.linphone.core.PayloadType;
-import org.linphone.core.tools.Log;
-import org.linphone.core.tools.OpenH264DownloadHelper;
-import org.linphone.core.tools.OpenH264DownloadHelperListener;
-import org.linphone.settings.LinphonePreferences;
-
-public class OpenH264DownloadAssistantActivity extends AssistantActivity {
-    private TextView mYes, mNo;
-    private ProgressBar mProgress;
-
-    private OpenH264DownloadHelper mHelper;
-    private OpenH264DownloadHelperListener mListener;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.assistant_openh264_codec_download);
-        mHelper = Factory.instance().createOpenH264DownloadHelper(this);
-        LinphonePreferences.instance().setOpenH264CodecDownloadEnabled(false);
-
-        mProgress = findViewById(R.id.progress_bar);
-
-        mYes = findViewById(R.id.answer_yes);
-        mYes.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mYes.setEnabled(false);
-                        mNo.setEnabled(false);
-                        Log.e("[OpenH264 Downloader Assistant] Start download");
-                        mProgress.setVisibility(View.VISIBLE);
-                        mHelper.downloadCodec();
-                    }
-                });
-
-        mNo = findViewById(R.id.answer_no);
-        mNo.setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mYes.setEnabled(false);
-                        mNo.setEnabled(false);
-                        Log.e("[OpenH264 Downloader Assistant] Download refused");
-                        goToLinphoneActivity();
-                    }
-                });
-
-        mListener =
-                new OpenH264DownloadHelperListener() {
-                    @Override
-                    public void OnProgress(int current, int max) {
-                        if (current < max) {
-                            mProgress.setMax(max);
-                            mProgress.setProgress(current);
-                        } else {
-                            Core core = LinphoneManager.getCore();
-                            if (core != null) {
-                                core.reloadMsPlugins(getApplicationInfo().nativeLibraryDir);
-                                enableH264();
-                            }
-
-                            goToLinphoneActivity();
-                        }
-                    }
-
-                    @Override
-                    public void OnError(String s) {
-                        Log.e("[OpenH264 Downloader Assistant] " + s);
-                        mYes.setEnabled(true);
-                        mNo.setEnabled(true);
-                    }
-                };
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mHelper.setOpenH264HelperListener(mListener);
-    }
-
-    @Override
-    protected void onPause() {
-        mHelper.setOpenH264HelperListener(null);
-        super.onPause();
-    }
-
-    private void enableH264() {
-        for (PayloadType pt : LinphoneManager.getCore().getVideoPayloadTypes()) {
-            if (pt.getMimeType().equals("H264")) {
-                pt.enable(true);
-                break;
-            }
-        }
-    }
-}