diff --git a/lib/src/crypto-utils.ts b/lib/src/crypto-utils.ts
index 174f1da..661b6b1 100644
--- a/lib/src/crypto-utils.ts
+++ b/lib/src/crypto-utils.ts
@@ -1,8 +1,6 @@
 import { Message } from "./entities/message"
-import PubNub from "pubnub"
 import { TextMessageContent } from "./types"
 import { Chat } from "./entities/chat"
-// pubNubCryptoModule: typeof PubNub.CryptoModule
 
 export class CryptoUtils {
   static decrypt({
diff --git a/samples/react-native-group-chat/components/message-text/MessageText.tsx b/samples/react-native-group-chat/components/message-text/MessageText.tsx
index 8c16975..8d544ff 100644
--- a/samples/react-native-group-chat/components/message-text/MessageText.tsx
+++ b/samples/react-native-group-chat/components/message-text/MessageText.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useContext, useEffect, useState } from "react"
 import { Bubble } from "react-native-gifted-chat"
 import { EnhancedIMessage } from "../../utils"
-import { Image, Linking, View } from "react-native"
+import { Linking, Platform, View } from "react-native"
 import { Quote } from "../quote"
 import { Text } from "../../ui-components"
 import { Message, MixedTextTypedElement } from "@pubnub/chat"
@@ -132,12 +132,10 @@ export function MessageText({ onGoToMessage, messageProps }: MessageTextProps) {
   )
 
   const renderImage = () => {
-    if (!imageSrc) {
+    if (!imageSrc || Platform.OS !== "web") {
       return
     }
-    // console.log("src?", imageSrc)
     // display just one image for now
-    // return <Image source={{ uri: imageSrc }} style={{ width: 100, height: 100 }} />
     return <img src={imageSrc} style={{ width: 100, height: 100 }} />
   }
 
diff --git a/samples/react-native-group-chat/screens/ordinary/chat/Chat.tsx b/samples/react-native-group-chat/screens/ordinary/chat/Chat.tsx
index e657959..c64848a 100644
--- a/samples/react-native-group-chat/screens/ordinary/chat/Chat.tsx
+++ b/samples/react-native-group-chat/screens/ordinary/chat/Chat.tsx
@@ -391,7 +391,7 @@ const styles = StyleSheet.create({
     alignItems: "center",
   },
   actionsContainer: {
-    width: 80,
+    width: Platform.OS === "web" ? 80 : 40,
     height: 40,
     justifyContent: "center",
     alignItems: "center",