diff --git a/app/client/src/ce/components/editorComponents/CodeEditorSignPosting.tsx b/app/client/src/ce/components/editorComponents/CodeEditorSignPosting.tsx
index 3ca8326c9c..9fe8cb04ac 100644
--- a/app/client/src/ce/components/editorComponents/CodeEditorSignPosting.tsx
+++ b/app/client/src/ce/components/editorComponents/CodeEditorSignPosting.tsx
@@ -10,14 +10,12 @@ export function CodeEditorSignPosting(props: {
   isOpen?: boolean;
   editorTheme?: EditorTheme;
   showLightningMenu?: boolean;
-  isAIEnabled?: boolean;
   mode: TEditorModes;
   forComp?: string;
 }): JSX.Element {
   return (
     <BindingPrompt
       editorTheme={props.editorTheme}
-      isAIEnabled={props.isAIEnabled}
       isOpen={props.isOpen || false}
       promptMessage={props.promptMessage}
       showLightningMenu={props.showLightningMenu}
diff --git a/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx b/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx
deleted file mode 100644
index 82d9cc4a20..0000000000
--- a/app/client/src/ce/components/editorComponents/EditorFormSignPosting.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { TEditorModes } from "components/editorComponents/CodeEditor/EditorConfig";
-
-export interface Props {
-  isAIEnabled: boolean;
-  mode: TEditorModes;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function EditorFormSignPosting(props: Props) {
-  return null;
-}
diff --git a/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx b/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
index f116acacac..8641b3c7bc 100644
--- a/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/BindingPrompt.tsx
@@ -28,7 +28,6 @@ function BindingPrompt(props: {
   isOpen: boolean;
   editorTheme?: EditorTheme;
   showLightningMenu?: boolean;
-  isAIEnabled?: boolean;
 }): JSX.Element {
   const promptRef = useRef<HTMLDivElement>(null);
   const customMessage = !!props.promptMessage;
diff --git a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
index 85cde062f5..0b8904348a 100644
--- a/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/generateQuickCommands.tsx
@@ -100,8 +100,8 @@ export function Command(props: {
 }) {
   return (
     <div className="command-container">
-      <div className="command">
-        {props.icon}
+      <div className="command flex">
+        <div className="self-center">{props.icon}</div>
         <div className="flex flex-col gap-1">
           <div className="overflow-hidden overflow-ellipsis whitespace-nowrap flex flex-row items-center gap-2 text-[color:var(--ads-v2\-colors-content-label-default-fg)]">
             {props.name}
@@ -235,7 +235,6 @@ export const generateQuickCommands = (
       displayText: APPSMITH_AI,
       shortcut: Shortcuts.ASK_AI,
       triggerCompletionsPostPick: true,
-      description: "Generate code using AI",
       isBeta: true,
       action: () => {
         executeCommand({
diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 4d4f3d3c59..fedf143147 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -1694,7 +1694,6 @@ class CodeEditor extends Component<Props, State> {
                 <CodeEditorSignPosting
                   editorTheme={this.props.theme}
                   forComp="editor"
-                  isAIEnabled={this.AIEnabled}
                   isOpen={this.isBindingPromptOpen()}
                   mode={this.props.mode}
                   promptMessage={this.props.promptMessage}
diff --git a/app/client/src/ee/components/editorComponents/EditorFormSignPosting.tsx b/app/client/src/ee/components/editorComponents/EditorFormSignPosting.tsx
deleted file mode 100644
index 62e1e3d375..0000000000
--- a/app/client/src/ee/components/editorComponents/EditorFormSignPosting.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from "ce/components/editorComponents/EditorFormSignPosting";
diff --git a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
index ce872932f1..87fda7f69f 100644
--- a/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/EditorJSONtoForm.tsx
@@ -124,10 +124,6 @@ import { ENTITY_TYPE as SOURCE_ENTITY_TYPE } from "entities/AppsmithConsole";
 import { DocsLink, openDoc } from "../../../constants/DocumentationLinks";
 import ActionExecutionInProgressView from "components/editorComponents/ActionExecutionInProgressView";
 import { CloseDebugger } from "components/editorComponents/Debugger/DebuggerTabs";
-import { isAIEnabled } from "@appsmith/components/editorComponents/GPT/trigger";
-import { editorSQLModes } from "components/editorComponents/CodeEditor/sql/config";
-import { EditorFormSignPosting } from "@appsmith/components/editorComponents/EditorFormSignPosting";
-import { selectFeatureFlags } from "@appsmith/selectors/featureFlagsSelectors";
 import {
   getHasCreateDatasourcePermission,
   getHasExecuteActionPermission,
@@ -915,15 +911,6 @@ export function EditorJSONtoForm(props: Props) {
     dispatch(setDebuggerSelectedTab(tabKey));
   }, []);
 
-  const isPostgresPlugin = currentActionPluginName === PluginName.POSTGRES;
-  const featureFlags = useSelector(selectFeatureFlags);
-  const editorMode = isPostgresPlugin
-    ? editorSQLModes.POSTGRESQL_WITH_BINDING
-    : editorSQLModes.MYSQL_WITH_BINDING;
-
-  const isAIEnabledForPosting =
-    isPostgresPlugin && isAIEnabled(featureFlags, editorMode);
-
   // close the debugger
   //TODO: move this to a common place
   const onClose = () => dispatch(showDebugger(false));
@@ -1014,11 +1001,6 @@ export function EditorJSONtoForm(props: Props) {
                     className="tab-panel"
                     value={EDITOR_TABS.QUERY}
                   >
-                    <EditorFormSignPosting
-                      isAIEnabled={isAIEnabledForPosting}
-                      mode={editorMode}
-                    />
-
                     <SettingsWrapper>
                       {editorConfig && editorConfig.length > 0 ? (
                         renderConfig(editorConfig)