diff --git a/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java b/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java
index bb591cb..087b798 100644
--- a/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java
+++ b/android/src/main/java/org/infobip/reactlibrary/mobilemessaging/ReactNativeMobileMessagingModule.java
@@ -876,65 +876,6 @@ protected Void doInBackground(Void... params) {
         }.execute();
     }
 
-    @ReactMethod
-    public synchronized void defaultMessageStorage_find(String messageId, final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-
-        for (Message m : messageStore.findAll(reactContext)) {
-            if (messageId.equals(m.getMessageId())) {
-                callback.invoke(ReactNativeJson.convertJsonToMap(MessageJson.toJSON(m)));
-                return;
-            }
-        }
-        callback.invoke();
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_findAll(final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-        List<Message> messages = messageStore.findAll(reactContext);
-        callback.invoke(ReactNativeJson.convertJsonToArray(MessageJson.toJSONArray(messages.toArray(new Message[messages.size()]))));
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_delete(String messageId, final Callback callback) throws JSONException {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-
-        List<Message> messagesToKeep = new ArrayList<Message>();
-        for (Message m : messageStore.findAll(reactContext)) {
-            if (messageId.equals(m.getMessageId())) {
-                continue;
-            }
-            messagesToKeep.add(m);
-        }
-        messageStore.deleteAll(reactContext);
-        messageStore.save(reactContext, messagesToKeep.toArray(new Message[messagesToKeep.size()]));
-        callback.invoke();
-    }
-
-    @ReactMethod
-    public synchronized void defaultMessageStorage_deleteAll(final Callback callback) {
-        MessageStore messageStore = MobileMessaging.getInstance(reactContext).getMessageStore();
-        if (messageStore == null) {
-            callback.invoke();
-            return;
-        }
-        messageStore.deleteAll(reactContext);
-        callback.invoke();
-    }
-
     /**
      * Message store adapter for JS layer
      */
diff --git a/src/index.d.ts b/src/index.d.ts
index bc26954..b2feeee 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -168,13 +168,13 @@ declare namespace MobileMessagingReactNative {
     }
 
     export interface DefaultMessageStorage {
-        find(messageId: string, callback: (message: Message) => void): void;
+        find(messageId: string, onSuccess: (message: Message) => void, onError: () => void): void;
 
-        findAll(callback: (messages: Message[]) => void): void;
+        findAll(onSuccess: (messages: Message[]) => void, onError: () => void): void;
 
-        delete(messageId: string, callback: () => void): void;
+        delete(messageId: string, onSuccess: () => void, onError: () => void): void;
 
-        deleteAll(callback: () => void): void;
+        deleteAll(onSuccess: () => void, onError: () => void): void;
     }
 
     export interface CustomMessageStorage {