diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
index 63ab2aeedf..cc729934d6 100644
--- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
+++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
@@ -1926,8 +1926,6 @@ public void onCues(CueGroup cueGroup) {
         }
     }
 
-    // ReactExoplayerViewManager public api
-
     public void setSrc(Source source) {
         if (source.getUri() != null) {
             clearResumePosition();
diff --git a/android/src/main/java/com/brentvatne/react/ReactNativeVideoManager.kt b/android/src/main/java/com/brentvatne/react/ReactNativeVideoManager.kt
index 73a4f10c48..0104c2b4db 100644
--- a/android/src/main/java/com/brentvatne/react/ReactNativeVideoManager.kt
+++ b/android/src/main/java/com/brentvatne/react/ReactNativeVideoManager.kt
@@ -1,7 +1,6 @@
 package com.brentvatne.react
 
 import com.brentvatne.common.toolbox.DebugLog
-import com.brentvatne.exoplayer.ReactExoplayerViewManager
 
 /**
  * ReactNativeVideoManager is a singleton class which allows to manipulate / the global state of the app
@@ -23,13 +22,13 @@ class ReactNativeVideoManager : RNVPlugin {
             }
     }
 
-    private var instanceList: ArrayList<ReactExoplayerViewManager> = ArrayList()
+    private var instanceList: ArrayList<Any> = ArrayList()
     private var pluginList: ArrayList<RNVPlugin> = ArrayList()
 
     /**
      * register a new ReactExoplayerViewManager in the managed list
      */
-    fun registerView(newInstance: ReactExoplayerViewManager) {
+    fun registerView(newInstance: Any) {
         if (instanceList.size > 2) {
             DebugLog.d(TAG, "multiple Video displayed ?")
         }
@@ -39,7 +38,7 @@ class ReactNativeVideoManager : RNVPlugin {
     /**
      * unregister existing ReactExoplayerViewManager in the managed list
      */
-    fun unregisterView(newInstance: ReactExoplayerViewManager) {
+    fun unregisterView(newInstance: Any) {
         instanceList.remove(newInstance)
     }