diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index 99ba7623..50a290df 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -127,12 +127,10 @@ export const App = ({
   const { streamingState, submitQuery, initError, pendingHistoryItem } =
     useGeminiStream(
       addItem,
-      clearItems,
       refreshStatic,
       setShowHelp,
       config,
       setDebugMessage,
-      openThemeDialog,
       handleSlashCommand,
     );
   const { elapsedTime, currentLoadingPhrase } =
@@ -230,7 +228,6 @@ export const App = ({
             <HistoryItemDisplay
               key={'history-' + historyItem.id}
               item={historyItem}
-              onSubmit={submitQuery}
             />
           );
         }}
@@ -240,7 +237,6 @@ export const App = ({
           // TODO(taehykim): It seems like references to ids aren't necessary in
           // HistoryItemDisplay. Refactor later. Use a fake id for now.
           item={{ ...pendingHistoryItem, id: 0 }}
-          onSubmit={submitQuery}
         />
       )}
       {showHelp && <Help commands={slashCommands} />}
diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
index 5fb9b32f..0c724feb 100644
--- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
@@ -11,18 +11,15 @@ import { GeminiMessage } from './messages/GeminiMessage.js';
 import { InfoMessage } from './messages/InfoMessage.js';
 import { ErrorMessage } from './messages/ErrorMessage.js';
 import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
-import { PartListUnion } from '@google/genai';
 import { GeminiMessageContent } from './messages/GeminiMessageContent.js';
 import { Box } from 'ink';
 
 interface HistoryItemDisplayProps {
   item: HistoryItem;
-  onSubmit: (value: PartListUnion) => void;
 }
 
 export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
   item,
-  onSubmit,
 }) => (
   <Box flexDirection="column" key={item.id}>
     {/* Render standard message types */}
@@ -34,11 +31,7 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
     {item.type === 'info' && <InfoMessage text={item.text} />}
     {item.type === 'error' && <ErrorMessage text={item.text} />}
     {item.type === 'tool_group' && (
-      <ToolGroupMessage
-        toolCalls={item.tools}
-        groupId={item.id}
-        onSubmit={onSubmit}
-      />
+      <ToolGroupMessage toolCalls={item.tools} groupId={item.id} />
     )}
   </Box>
 );
diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
index 7099537e..b43f6843 100644
--- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
@@ -6,7 +6,6 @@
 
 import React from 'react';
 import { Box, Text, useInput } from 'ink';
-import { PartListUnion } from '@google/genai';
 import { DiffRenderer } from './DiffRenderer.js';
 import { Colors } from '../../colors.js';
 import {
@@ -22,7 +21,6 @@ import {
 
 export interface ToolConfirmationMessageProps {
   confirmationDetails: ToolCallConfirmationDetails;
-  onSubmit: (value: PartListUnion) => void;
 }
 
 function isEditDetails(
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index a9a51232..50a6c480 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -8,21 +8,18 @@ import React from 'react';
 import { Box } from 'ink';
 import { IndividualToolCallDisplay, ToolCallStatus } from '../../types.js';
 import { ToolMessage } from './ToolMessage.js';
-import { PartListUnion } from '@google/genai';
 import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
 import { Colors } from '../../colors.js';
 
 interface ToolGroupMessageProps {
   groupId: number;
   toolCalls: IndividualToolCallDisplay[];
-  onSubmit: (value: PartListUnion) => void;
 }
 
 // Main component renders the border and maps the tools using ToolMessage
 export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
   groupId,
   toolCalls,
-  onSubmit,
 }) => {
   const hasPending = !toolCalls.every(
     (t) => t.status === ToolCallStatus.Success,
@@ -61,7 +58,6 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
             tool.confirmationDetails && (
               <ToolConfirmationMessage
                 confirmationDetails={tool.confirmationDetails}
-                onSubmit={onSubmit}
               ></ToolConfirmationMessage>
             )}
         </Box>
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 035f3e85..90ffac5c 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -55,12 +55,10 @@ enum StreamProcessingStatus {
  */
 export const useGeminiStream = (
   addItem: UseHistoryManagerReturn['addItem'],
-  _clearItems: UseHistoryManagerReturn['clearItems'],
   refreshStatic: () => void,
   setShowHelp: React.Dispatch<React.SetStateAction<boolean>>,
   config: Config,
   onDebugMessage: (message: string) => void,
-  _openThemeDialog: () => void,
   handleSlashCommand: (cmd: PartListUnion) => boolean,
 ) => {
   const toolRegistry = config.getToolRegistry();