diff --git a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt
index e45f2101..373c9ddf 100644
--- a/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt
+++ b/android/src/main/java/com/th3rdwave/safeareacontext/SafeAreaViewManager.kt
@@ -5,20 +5,14 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.ReactStylesDiffMap
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.viewmanagers.RNCSafeAreaViewManagerInterface
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.ReactViewManager
 
 @ReactModule(name = SafeAreaViewManager.REACT_CLASS)
-class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<SafeAreaView> {
+class SafeAreaViewManager : ReactViewManager() {
   override fun getName() = REACT_CLASS
 
-  // Make sure we're not using delegates for now since ReactViewGroupManager doesn't use one. If it
-  // does in the future we will need a way to compose delegates together.
-  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup>? = null
-
   override fun createViewInstance(context: ThemedReactContext) = SafeAreaView(context)
 
   override fun createShadowNodeInstance() = SafeAreaViewShadowNode()
@@ -26,7 +20,7 @@ class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<
   override fun getShadowNodeClass() = SafeAreaViewShadowNode::class.java
 
   @ReactProp(name = "mode")
-  override fun setMode(view: SafeAreaView, mode: String?) {
+  fun setMode(view: SafeAreaView, mode: String?) {
     when (mode) {
       "padding" -> {
         view.setMode(SafeAreaViewMode.PADDING)
@@ -38,7 +32,7 @@ class SafeAreaViewManager : ReactViewManager(), RNCSafeAreaViewManagerInterface<
   }
 
   @ReactProp(name = "edges")
-  override fun setEdges(view: SafeAreaView, propList: ReadableMap?) {
+  fun setEdges(view: SafeAreaView, propList: ReadableMap?) {
     if (propList != null) {
       view.setEdges(
           SafeAreaViewEdges(