diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java
index a3b7e09f..07a91893 100644
--- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java
+++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabase.java
@@ -382,12 +382,12 @@ public class RNFirebaseDatabase extends ReactContextBaseJavaModule {
    * @param key
    * @param path
    * @param modifiers
-   * @param eventName
+   * @param eventType
    * @param promise
    */
   @ReactMethod
-  public void once(String appName, String key, String path, ReadableArray modifiers, String eventName, Promise promise) {
-    getInternalReferenceForApp(appName, key, path, modifiers).once(eventName, promise);
+  public void once(String appName, String key, String path, ReadableArray modifiers, String eventType, Promise promise) {
+    getInternalReferenceForApp(appName, key, path, modifiers).once(eventType, promise);
   }
 
   /**
@@ -400,7 +400,6 @@ public class RNFirebaseDatabase extends ReactContextBaseJavaModule {
   public void on(String appName, ReadableMap props) {
     getInternalReferenceForApp(appName, props)
       .on(
-        this,
         props.getString("eventType"),
         props.getMap("registration")
       );
diff --git a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
index d38659e8..e6c2216b 100644
--- a/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
+++ b/android/src/main/java/io/invertase/firebase/database/RNFirebaseDatabaseReference.java
@@ -82,7 +82,8 @@ class RNFirebaseDatabaseReference {
   }
 
   /**
-   * TODO
+   * Remove an event listener by key, will remove either a ValueEventListener or
+   * a ChildEventListener
    *
    * @param eventRegistrationKey
    */
@@ -204,28 +205,27 @@ class RNFirebaseDatabaseReference {
   /**
    * Handles a React Native JS '.on(..)' request and initializes listeners.
    *
-   * @param database
    * @param registration
    */
-  void on(RNFirebaseDatabase database, String eventType, ReadableMap registration) {
+  void on(String eventType, ReadableMap registration) {
     if (eventType.equals("value")) {
-      addValueEventListener(registration, database);
+      addValueEventListener(registration);
     } else {
-      addChildEventListener(registration, eventType, database);
+      addChildEventListener(registration, eventType);
     }
   }
 
   /**
    * Handles a React Native JS 'once' request.
    *
-   * @param eventName
+   * @param eventType
    * @param promise
    */
-  void once(String eventName, Promise promise) {
-    if (eventName.equals("value")) {
+  void once(String eventType, Promise promise) {
+    if (eventType.equals("value")) {
       addOnceValueEventListener(promise);
     } else {
-      addChildOnceEventListener(eventName, promise);
+      addChildOnceEventListener(eventType, promise);
     }
   }
 
@@ -235,9 +235,8 @@ class RNFirebaseDatabaseReference {
    *
    * @param registration
    * @param eventType
-   * @param database
    */
-  private void addChildEventListener(final ReadableMap registration, final String eventType, final RNFirebaseDatabase database) {
+  private void addChildEventListener(final ReadableMap registration, final String eventType) {
     final String eventRegistrationKey = registration.getString("eventRegistrationKey");
     final String registrationCancellationKey = registration.getString("registrationCancellationKey");
 
@@ -286,11 +285,9 @@ class RNFirebaseDatabaseReference {
    * Add a native .on('value',.. ) event listener.
    *
    * @param registration
-   * @param database
    */
-  private void addValueEventListener(final ReadableMap registration, final RNFirebaseDatabase database) {
+  private void addValueEventListener(final ReadableMap registration) {
     final String eventRegistrationKey = registration.getString("eventRegistrationKey");
-    final String registrationCancellationKey = registration.getString("registrationCancellationKey");
 
     if (!hasEventListener(eventRegistrationKey)) {
       ValueEventListener valueEventListener = new ValueEventListener() {