diff --git a/react/src/Components/Footer/Components/MoreOptionsButton.js b/react/src/Components/Footer/Components/MoreOptionsButton.js
index 9e88d510..51f18abb 100644
--- a/react/src/Components/Footer/Components/MoreOptionsButton.js
+++ b/react/src/Components/Footer/Components/MoreOptionsButton.js
@@ -116,7 +116,7 @@ function MoreOptionsButton(props) {
           />
           <Tooltip title={t("More options")} placement="top">
             <CustomizedBtn
-                className={footer ? "footer-icon-button" : ""}
+                className={props?.footer ? "footer-icon-button" : ""}
                 id="more-button"
                 data-testid="more-button-test"
                 variant="contained"
diff --git a/react/src/pages/AntMedia.js b/react/src/pages/AntMedia.js
index c780a17e..dfc4c73d 100644
--- a/react/src/pages/AntMedia.js
+++ b/react/src/pages/AntMedia.js
@@ -25,7 +25,6 @@ import PublisherRequestListDrawer from "../Components/PublisherRequestListDrawer
 import {WebinarRoles} from "../WebinarRoles";
 import Stack from "@mui/material/Stack";
 
-export const ConferenceContext = React.createContext(null);
 
 const globals = {
   //this settings is to keep consistent with the sdk until backend for the app is setup
@@ -3028,140 +3027,6 @@ function AntMedia(props) {
                 justifyContent="center"
                 alignItems={"center"}
             >
-                <ConferenceContext.Provider
-                    value={{
-                        isScreenShared,
-                        talkers,
-                        audioTracks,
-                        isPublished,
-                        selectedCamera,
-                        selectedMicrophone,
-                        selectedBackgroundMode,
-                        videoTrackAssignments,
-                        setVideoTrackAssignments,
-                        messageDrawerOpen,
-                        participantListDrawerOpen,
-                        messages,
-                        numberOfUnReadMessages,
-                        participantUpdated,
-                        allParticipants,
-                        globals,
-                        isPlayOnly,
-                        setIsPlayOnly,
-                        localVideo,
-                        streamName,
-                        initialized,
-                        devices,
-                        publishStreamId,
-                        isMyMicMuted,
-                        isMyCamTurnedOff,
-                        sendReactions,
-                        setSelectedBackgroundMode,
-                        setIsVideoEffectRunning,
-                        handleMessageDrawerOpen,
-                        handleParticipantListOpen,
-                        setSelectedCamera,
-                        setSelectedMicrophone,
-                        setLeftTheRoom,
-                        joinRoom,
-                        handleStopScreenShare,
-                        handleStartScreenShare,
-                        cameraSelected,
-                        microphoneSelected,
-                        handleBackgroundReplacement,
-                        muteLocalMic,
-                        unmuteLocalMic,
-                        toggleMic,
-                        checkAndTurnOnLocalCamera,
-                        checkAndTurnOffLocalCamera,
-                        setAudioLevelListener,
-                        handleSetMessages,
-                        toggleSetNumberOfUnreadMessages,
-                        pinVideo,
-                        setLocalVideo,
-                        setWaitingOrMeetingRoom,
-                        setStreamName,
-                        handleLeaveFromRoom,
-                        handleSendNotificationEvent,
-                        handleSetDesiredTileCount,
-                        handleSendMessage,
-                        turnOffYourMicNotification,
-                        addFakeParticipant,
-                        removeFakeParticipant,
-                        fakeReconnect,
-                        showEmojis,
-                        setShowEmojis,
-                        isMuteParticipantDialogOpen,
-                        setMuteParticipantDialogOpen,
-                        participantIdMuted,
-                        setParticipantIdMuted,
-                        videoSendResolution,
-                        setVideoSendResolution,
-                        makeid,
-                        startRecord,
-                        stopRecord,
-                        isRecordPluginInstalled,
-                        isRecordPluginActive,
-                        isEnterDirectly,
-                        publisherRequestListDrawerOpen,
-                        setPublisherRequestListDrawerOpen,
-                        isAdmin,
-                        setIsAdmin,
-                        presenterButtonDisabled,
-                        setPresenterButtonDisabled,
-                        effectsDrawerOpen,
-                        handleEffectsOpen,
-                        setVirtualBackgroundImage,
-                        localVideoCreate,
-                        microphoneButtonDisabled,
-                        setMicrophoneButtonDisabled,
-                        cameraButtonDisabled,
-                        setCameraButtonDisabled,
-                        updateMaxVideoTrackCount,
-                        checkAndUpdateVideoAudioSources,
-                        setDevices,
-                        getSelectedDevices,
-                        setIsJoining,
-                        isJoining,
-                        setParticipantUpdated,
-                        makeParticipantPresenter,
-                        makeParticipantUndoPresenter,
-                        isBecomePublisherConfirmationDialogOpen,
-                        setBecomePublisherConfirmationDialogOpen,
-                        requestSpeakerList,
-                        turnOnYourMicNotification,
-                        turnOffYourCamNotification,
-                        handlePublisherRequestListOpen,
-                        setRequestSpeakerList,
-                        presenterButtonStreamIdInProcess,
-                        roomName,
-                        role,
-                        speedTestObject,
-                        setSpeedTestObject,
-                        speedTestStreamId,
-                        startSpeedTest,
-                        stopSpeedTest,
-                        statsList,
-                        getTrackStats,
-                        isBroadcasting,
-                        playStats,
-                        checkAndSetIsPinned,
-                        updateAllParticipantsPagination,
-                        pagedParticipants,
-                        participantCount,
-                        setParticipantCount,
-                        checkAndUpdateVideoAudioSourcesForPublishSpeedTest,
-                        fetchImageAsBlob,
-                        setAndEnableVirtualBackgroundImage,
-                        setAndFillPlayStatsList,
-                        setAndFillPublishStatsList,
-                        setSpeedTestObjectFailed,
-                        setSpeedTestObjectProgress,
-                        calculateThePlaySpeedTestResult,
-                        processUpdatedStatsForPlaySpeedTest,
-                        speedTestCounter
-                    }}
-                >
                     {props.children}
                     <UnauthrorizedDialog
                         onClose={handleUnauthorizedDialogExitClicked}
@@ -3375,7 +3240,6 @@ function AntMedia(props) {
                             <PublisherRequestListDrawer/>
                         </>
                     )}
-                </ConferenceContext.Provider>
             </Grid>
         </Grid>
     );