diff --git a/uni_links/android/build.gradle b/uni_links/android/build.gradle
index e3355ff..070de02 100644
--- a/uni_links/android/build.gradle
+++ b/uni_links/android/build.gradle
@@ -22,8 +22,9 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'name.avioli.unilinks'
     compileSdkVersion 28
-
+    
     defaultConfig {
         minSdkVersion 16
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/uni_links/android/src/main/AndroidManifest.xml b/uni_links/android/src/main/AndroidManifest.xml
index a2af139..c4e6c98 100644
--- a/uni_links/android/src/main/AndroidManifest.xml
+++ b/uni_links/android/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="name.avioli.unilinks">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java
index 297546d..b9b37c6 100644
--- a/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java
+++ b/uni_links/android/src/main/java/name/avioli/unilinks/UniLinksPlugin.java
@@ -17,10 +17,10 @@
 
 public class UniLinksPlugin
         implements FlutterPlugin,
-                MethodChannel.MethodCallHandler,
-                EventChannel.StreamHandler,
-                ActivityAware,
-                PluginRegistry.NewIntentListener {
+        MethodChannel.MethodCallHandler,
+        EventChannel.StreamHandler,
+        ActivityAware,
+        PluginRegistry.NewIntentListener {
 
     private static final String MESSAGES_CHANNEL = "uni_links/messages";
     private static final String EVENTS_CHANNEL = "uni_links/events";
@@ -80,23 +80,9 @@ private static void register(BinaryMessenger messenger, UniLinksPlugin plugin) {
         eventChannel.setStreamHandler(plugin);
     }
 
-    /** Plugin registration. */
-    public static void registerWith(@NonNull PluginRegistry.Registrar registrar) {
-        // Detect if we've been launched in background
-        if (registrar.activity() == null) {
-            return;
-        }
-
-        final UniLinksPlugin instance = new UniLinksPlugin();
-        instance.context = registrar.context();
-        register(registrar.messenger(), instance);
-
-        instance.handleIntent(registrar.context(), registrar.activity().getIntent());
-        registrar.addNewIntentListener(instance);
-    }
-
     @Override
-    public void onDetachedFromEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {}
+    public void onDetachedFromEngine(@NonNull FlutterPluginBinding flutterPluginBinding) {
+    }
 
     @Override
     public void onListen(Object o, EventChannel.EventSink eventSink) {
@@ -132,7 +118,8 @@ public void onAttachedToActivity(@NonNull ActivityPluginBinding activityPluginBi
     }
 
     @Override
-    public void onDetachedFromActivityForConfigChanges() {}
+    public void onDetachedFromActivityForConfigChanges() {
+    }
 
     @Override
     public void onReattachedToActivityForConfigChanges(
@@ -142,5 +129,6 @@ public void onReattachedToActivityForConfigChanges(
     }
 
     @Override
-    public void onDetachedFromActivity() {}
+    public void onDetachedFromActivity() {
+    }
 }