diff --git a/apps/x/apps/renderer/src/components/connectors-popover.tsx b/apps/x/apps/renderer/src/components/connectors-popover.tsx
index e28f662e..92b13a48 100644
--- a/apps/x/apps/renderer/src/components/connectors-popover.tsx
+++ b/apps/x/apps/renderer/src/components/connectors-popover.tsx
@@ -2,7 +2,7 @@
 
 import * as React from "react"
 import { useState } from "react"
-import { AlertTriangle, Loader2, Mic, Mail, Calendar, MessageSquare, User } from "lucide-react"
+import { AlertTriangle, Loader2, Mic, Mail, Calendar, User } from "lucide-react"
 
 import {
   Popover,
@@ -15,7 +15,6 @@ import {
   TooltipTrigger,
 } from "@/components/ui/tooltip"
 import { Button } from "@/components/ui/button"
-import { Switch } from "@/components/ui/switch"
 import { Separator } from "@/components/ui/separator"
 import { GoogleClientIdModal } from "@/components/google-client-id-modal"
 import { ComposioApiKeyModal } from "@/components/composio-api-key-modal"
@@ -126,8 +125,6 @@ export function ConnectorsPopover({ children, tooltip, open: openProp, onOpenCha
   // Check if Gmail is unconnected (for filtering in unconnected mode)
   const isGmailUnconnected = c.useComposioForGoogle ? !c.gmailConnected && !c.gmailLoading : true
   const isGoogleCalendarUnconnected = c.useComposioForGoogleCalendar ? !c.googleCalendarConnected && !c.googleCalendarLoading : true
-  const isGranolaUnconnected = !c.granolaEnabled && !c.granolaLoading
-  const isSlackUnconnected = !c.slackEnabled && !c.slackLoading
 
   // For unconnected mode, check if there's anything to show
   const hasUnconnectedEmailCalendar = (() => {
@@ -143,7 +140,6 @@ export function ConnectorsPopover({ children, tooltip, open: openProp, onOpenCha
 
   const hasUnconnectedMeetingNotes = (() => {
     if (!isUnconnectedMode) return true
-    if (isGranolaUnconnected) return true
     if (c.providers.includes('fireflies-ai')) {
       const firefliesState = c.providerStates['fireflies-ai']
       if (!firefliesState?.isConnected || c.providerStatus['fireflies-ai']?.error) return true
@@ -151,15 +147,13 @@ export function ConnectorsPopover({ children, tooltip, open: openProp, onOpenCha
     return false
   })()
 
-  const hasUnconnectedSlack = !isUnconnectedMode || isSlackUnconnected
-
   const isRowboatUnconnected = (() => {
     if (!c.providers.includes('rowboat')) return false
     const rowboatState = c.providerStates['rowboat']
     return !rowboatState?.isConnected || rowboatState?.isLoading
   })()
 
-  const allConnected = isUnconnectedMode && !isRowboatUnconnected && !hasUnconnectedEmailCalendar && !hasUnconnectedMeetingNotes && !hasUnconnectedSlack
+  const allConnected = isUnconnectedMode && !isRowboatUnconnected && !hasUnconnectedEmailCalendar && !hasUnconnectedMeetingNotes
 
   return (
     <>
@@ -357,128 +351,12 @@ export function ConnectorsPopover({ children, tooltip, open: openProp, onOpenCha
                     <span className="text-xs font-medium text-muted-foreground">Meeting Notes</span>
                   </div>
 
-                  {/* Granola - show in unconnected mode only if not enabled */}
-                  {(!isUnconnectedMode || isGranolaUnconnected) && (
-                    <div className="flex items-center justify-between gap-3 rounded-md px-3 py-2 hover:bg-accent">
-                      <div className="flex items-center gap-3 min-w-0">
-                        <div className="flex size-8 items-center justify-center rounded-md bg-muted">
-                          <Mic className="size-4" />
-                        </div>
-                        <div className="flex flex-col min-w-0">
-                          <span className="text-sm font-medium truncate">Granola</span>
-                          <span className="text-xs text-muted-foreground truncate">
-                            Local meeting notes
-                          </span>
-                        </div>
-                      </div>
-                      <div className="shrink-0 flex items-center gap-2">
-                        {c.granolaLoading && (
-                          <Loader2 className="size-3 animate-spin" />
-                        )}
-                        <Switch
-                          checked={c.granolaEnabled}
-                          onCheckedChange={c.handleGranolaToggle}
-                          disabled={c.granolaLoading}
-                        />
-                      </div>
-                    </div>
-                  )}
-
                   {/* Fireflies */}
                   {c.providers.includes('fireflies-ai') && renderOAuthProvider('fireflies-ai', 'Fireflies', <Mic className="size-4" />, 'AI meeting transcripts')}
 
                   <Separator className="my-2" />
                 </>
               )}
-
-              {/* Team Communication Section */}
-              {hasUnconnectedSlack && (
-                <>
-                  <div className="px-2 py-1.5">
-                    <span className="text-xs font-medium text-muted-foreground">Team Communication</span>
-                  </div>
-
-                  <div className="rounded-md px-3 py-2 hover:bg-accent">
-                    <div className="flex items-center justify-between gap-3">
-                      <div className="flex items-center gap-3 min-w-0">
-                        <div className="flex size-8 items-center justify-center rounded-md bg-muted">
-                          <MessageSquare className="size-4" />
-                        </div>
-                        <div className="flex flex-col min-w-0">
-                          <span className="text-sm font-medium truncate">Slack</span>
-                          {c.slackEnabled && c.slackWorkspaces.length > 0 ? (
-                            <span className="text-xs text-muted-foreground truncate">
-                              {c.slackWorkspaces.map(w => w.name).join(', ')}
-                            </span>
-                          ) : (
-                            <span className="text-xs text-muted-foreground truncate">
-                              Send messages and view channels
-                            </span>
-                          )}
-                        </div>
-                      </div>
-                      <div className="shrink-0 flex items-center gap-2">
-                        {(c.slackLoading || c.slackDiscovering) && (
-                          <Loader2 className="size-3 animate-spin" />
-                        )}
-                        {c.slackEnabled ? (
-                          <Switch
-                            checked={true}
-                            onCheckedChange={() => c.handleSlackDisable()}
-                            disabled={c.slackLoading}
-                          />
-                        ) : (
-                          <Button
-                            variant="default"
-                            size="sm"
-                            onClick={c.handleSlackEnable}
-                            disabled={c.slackLoading || c.slackDiscovering}
-                            className="h-7 px-2 text-xs"
-                          >
-                            Enable
-                          </Button>
-                        )}
-                      </div>
-                    </div>
-                    {c.slackPickerOpen && (
-                      <div className="mt-2 ml-11 space-y-2">
-                        {c.slackDiscoverError ? (
-                          <p className="text-xs text-muted-foreground">{c.slackDiscoverError}</p>
-                        ) : (
-                          <>
-                            {c.slackAvailableWorkspaces.map(w => (
-                              <label key={w.url} className="flex items-center gap-2 text-sm cursor-pointer">
-                                <input
-                                  type="checkbox"
-                                  checked={c.slackSelectedUrls.has(w.url)}
-                                  onChange={(e) => {
-                                    c.setSlackSelectedUrls(prev => {
-                                      const next = new Set(prev)
-                                      if (e.target.checked) next.add(w.url)
-                                      else next.delete(w.url)
-                                      return next
-                                    })
-                                  }}
-                                  className="rounded border-border"
-                                />
-                                <span className="truncate">{w.name}</span>
-                              </label>
-                            ))}
-                            <Button
-                              size="sm"
-                              onClick={c.handleSlackSaveWorkspaces}
-                              disabled={c.slackSelectedUrls.size === 0 || c.slackLoading}
-                              className="h-7 px-3 text-xs"
-                            >
-                              Save
-                            </Button>
-                          </>
-                        )}
-                      </div>
-                    )}
-                  </div>
-                </>
-              )}
             </>
           )}
         </div>
diff --git a/apps/x/apps/renderer/src/components/onboarding/steps/completion-step.tsx b/apps/x/apps/renderer/src/components/onboarding/steps/completion-step.tsx
index c01e42ea..2b32309a 100644
--- a/apps/x/apps/renderer/src/components/onboarding/steps/completion-step.tsx
+++ b/apps/x/apps/renderer/src/components/onboarding/steps/completion-step.tsx
@@ -8,8 +8,8 @@ interface CompletionStepProps {
 }
 
 export function CompletionStep({ state }: CompletionStepProps) {
-  const { connectedProviders, granolaEnabled, slackEnabled, gmailConnected, googleCalendarConnected, handleComplete } = state
-  const hasConnections = connectedProviders.length > 0 || granolaEnabled || slackEnabled || gmailConnected || googleCalendarConnected
+  const { connectedProviders, gmailConnected, googleCalendarConnected, handleComplete } = state
+  const hasConnections = connectedProviders.length > 0 || gmailConnected || googleCalendarConnected
 
   return (
     <div className="flex flex-col items-center justify-center text-center flex-1">
@@ -109,28 +109,6 @@ export function CompletionStep({ state }: CompletionStepProps) {
                 <span>Fireflies (Meeting transcripts)</span>
               </motion.div>
             )}
-            {granolaEnabled && (
-              <motion.div
-                initial={{ opacity: 0, x: -8 }}
-                animate={{ opacity: 1, x: 0 }}
-                transition={{ delay: 0.6 }}
-                className="flex items-center gap-2 text-sm text-muted-foreground"
-              >
-                <CheckCircle2 className="size-4 text-green-600 dark:text-green-400" />
-                <span>Granola (Local meeting notes)</span>
-              </motion.div>
-            )}
-            {slackEnabled && (
-              <motion.div
-                initial={{ opacity: 0, x: -8 }}
-                animate={{ opacity: 1, x: 0 }}
-                transition={{ delay: 0.65 }}
-                className="flex items-center gap-2 text-sm text-muted-foreground"
-              >
-                <CheckCircle2 className="size-4 text-green-600 dark:text-green-400" />
-                <span>Slack (Team communication)</span>
-              </motion.div>
-            )}
           </div>
         </motion.div>
       )}
diff --git a/apps/x/apps/renderer/src/components/onboarding/steps/connect-accounts-step.tsx b/apps/x/apps/renderer/src/components/onboarding/steps/connect-accounts-step.tsx
index b152d567..ae9afea8 100644
--- a/apps/x/apps/renderer/src/components/onboarding/steps/connect-accounts-step.tsx
+++ b/apps/x/apps/renderer/src/components/onboarding/steps/connect-accounts-step.tsx
@@ -1,9 +1,8 @@
 import { Loader2, CheckCircle2, ArrowLeft, Calendar } from "lucide-react"
 import { motion } from "motion/react"
 import { Button } from "@/components/ui/button"
-import { Switch } from "@/components/ui/switch"
 import { cn } from "@/lib/utils"
-import { GmailIcon, SlackIcon, FirefliesIcon, GranolaIcon } from "../provider-icons"
+import { GmailIcon, FirefliesIcon } from "../provider-icons"
 import type { OnboardingState, ProviderState } from "../use-onboarding-state"
 
 interface ConnectAccountsStepProps {
@@ -85,11 +84,6 @@ function ProviderCard({
 export function ConnectAccountsStep({ state }: ConnectAccountsStepProps) {
   const {
     providers, providersLoading, providerStates, handleConnect,
-    granolaEnabled, granolaLoading, handleGranolaToggle,
-    slackEnabled, slackLoading, slackWorkspaces, slackAvailableWorkspaces,
-    slackSelectedUrls, setSlackSelectedUrls, slackPickerOpen,
-    slackDiscovering, slackDiscoverError,
-    handleSlackEnable, handleSlackSaveWorkspaces, handleSlackDisable,
     useComposioForGoogle, gmailConnected, gmailLoading, gmailConnecting, handleConnectGmail,
     useComposioForGoogleCalendar, googleCalendarConnected, googleCalendarLoading, googleCalendarConnecting, handleConnectGoogleCalendar,
     handleNext, handleBack,
@@ -158,30 +152,11 @@ export function ConnectAccountsStep({ state }: ConnectAccountsStepProps) {
           )}
 
           {/* Meeting Notes */}
-          <div className="space-y-3">
-            <span className="text-xs font-semibold text-muted-foreground uppercase tracking-wider">
-              Meeting Notes
-            </span>
-            <ProviderCard
-              name="Granola"
-              description="Sync your local meeting notes for richer context"
-              icon={<GranolaIcon />}
-              iconBg="bg-purple-500/10"
-              iconColor="text-purple-500"
-              providerState={{ isConnected: granolaEnabled, isLoading: false, isConnecting: false }}
-              rightSlot={
-                <div className="flex items-center gap-2">
-                  {granolaLoading && <Loader2 className="size-3 animate-spin" />}
-                  <Switch
-                    checked={granolaEnabled}
-                    onCheckedChange={handleGranolaToggle}
-                    disabled={granolaLoading}
-                  />
-                </div>
-              }
-              index={cardIndex++}
-            />
-            {providers.includes('fireflies-ai') && (
+          {providers.includes('fireflies-ai') && (
+            <div className="space-y-3">
+              <span className="text-xs font-semibold text-muted-foreground uppercase tracking-wider">
+                Meeting Notes
+              </span>
               <ProviderCard
                 name="Fireflies"
                 description="Import AI-powered meeting transcripts automatically"
@@ -192,85 +167,8 @@ export function ConnectAccountsStep({ state }: ConnectAccountsStepProps) {
                 onConnect={() => handleConnect('fireflies-ai')}
                 index={cardIndex++}
               />
-            )}
-          </div>
-
-          {/* Team Communication */}
-          <div className="space-y-3">
-            <span className="text-xs font-semibold text-muted-foreground uppercase tracking-wider">
-              Team Communication
-            </span>
-            <div>
-              <ProviderCard
-                name="Slack"
-                description={
-                  slackEnabled && slackWorkspaces.length > 0
-                    ? slackWorkspaces.map(w => w.name).join(', ')
-                    : "Enable Rowboat to understand your team conversations and provide relevant context"
-                }
-                icon={<SlackIcon />}
-                iconBg="bg-emerald-500/10"
-                iconColor="text-emerald-500"
-                providerState={{ isConnected: slackEnabled, isLoading: false, isConnecting: false }}
-                rightSlot={
-                  <div className="flex items-center gap-2">
-                    {(slackLoading || slackDiscovering) && <Loader2 className="size-3 animate-spin" />}
-                    {slackEnabled ? (
-                      <Switch
-                        checked={true}
-                        onCheckedChange={() => handleSlackDisable()}
-                        disabled={slackLoading}
-                      />
-                    ) : (
-                      <Button
-                        size="sm"
-                        onClick={handleSlackEnable}
-                        disabled={slackLoading || slackDiscovering}
-                      >
-                        Enable
-                      </Button>
-                    )}
-                  </div>
-                }
-                index={cardIndex++}
-              />
-              {slackPickerOpen && (
-                <div className="mt-2 ml-[3.25rem] space-y-2 pl-4 border-l-2 border-muted">
-                  {slackDiscoverError ? (
-                    <p className="text-xs text-muted-foreground">{slackDiscoverError}</p>
-                  ) : (
-                    <>
-                      {slackAvailableWorkspaces.map(w => (
-                        <label key={w.url} className="flex items-center gap-2 text-sm cursor-pointer">
-                          <input
-                            type="checkbox"
-                            checked={slackSelectedUrls.has(w.url)}
-                            onChange={(e) => {
-                              setSlackSelectedUrls(prev => {
-                                const next = new Set(prev)
-                                if (e.target.checked) next.add(w.url)
-                                else next.delete(w.url)
-                                return next
-                              })
-                            }}
-                            className="rounded border-border"
-                          />
-                          <span className="truncate">{w.name}</span>
-                        </label>
-                      ))}
-                      <Button
-                        size="sm"
-                        onClick={handleSlackSaveWorkspaces}
-                        disabled={slackSelectedUrls.size === 0 || slackLoading}
-                      >
-                        Save
-                      </Button>
-                    </>
-                  )}
-                </div>
-              )}
             </div>
-          </div>
+          )}
         </div>
       )}
 
diff --git a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
index 1cb12f6e..74f0ad6c 100644
--- a/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
+++ b/apps/x/apps/renderer/src/components/settings/connected-accounts-settings.tsx
@@ -1,10 +1,8 @@
 "use client"
 
 import * as React from "react"
-import { Loader2, Mic, Mail, Calendar, MessageSquare } from "lucide-react"
+import { Loader2, Mic, Mail, Calendar } from "lucide-react"
 import { Button } from "@/components/ui/button"
-import { Switch } from "@/components/ui/switch"
-import { Separator } from "@/components/ui/separator"
 import { GoogleClientIdModal } from "@/components/google-client-id-modal"
 import { ComposioApiKeyModal } from "@/components/composio-api-key-modal"
 import { useConnectors } from "@/hooks/useConnectors"
@@ -235,129 +233,18 @@ export function ConnectedAccountsSettings({ dialogOpen }: ConnectedAccountsSetti
         )}
 
         {/* Meeting Notes Section */}
-        <div className="px-4 py-2">
-          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
-            Meeting Notes
-          </span>
-        </div>
-
-        {/* Granola */}
-        <div className="flex items-center justify-between gap-3 rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
-          <div className="flex items-center gap-3 min-w-0">
-            <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
-              <Mic className="size-4" />
-            </div>
-            <div className="flex flex-col min-w-0">
-              <span className="text-sm font-medium truncate">Granola</span>
-              <span className="text-xs text-muted-foreground truncate">
-                Local meeting notes
+        {c.providers.includes('fireflies-ai') && (
+          <>
+            <div className="px-4 py-2">
+              <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
+                Meeting Notes
               </span>
             </div>
-          </div>
-          <div className="shrink-0 flex items-center gap-2">
-            {c.granolaLoading && (
-              <Loader2 className="size-3 animate-spin" />
-            )}
-            <Switch
-              checked={c.granolaEnabled}
-              onCheckedChange={c.handleGranolaToggle}
-              disabled={c.granolaLoading}
-            />
-          </div>
-        </div>
 
-        {/* Fireflies */}
-        {c.providers.includes('fireflies-ai') && renderOAuthProvider('fireflies-ai', 'Fireflies', <Mic className="size-4" />, 'AI meeting transcripts')}
-
-        <Separator className="my-3" />
-
-        {/* Team Communication Section */}
-        <div className="px-4 py-2">
-          <span className="text-xs font-medium text-muted-foreground uppercase tracking-wider">
-            Team Communication
-          </span>
-        </div>
-
-        {/* Slack */}
-        <div className="rounded-lg px-4 py-3 hover:bg-accent/50 transition-colors">
-          <div className="flex items-center justify-between gap-3">
-            <div className="flex items-center gap-3 min-w-0">
-              <div className="flex size-9 items-center justify-center rounded-lg bg-muted">
-                <MessageSquare className="size-4" />
-              </div>
-              <div className="flex flex-col min-w-0">
-                <span className="text-sm font-medium truncate">Slack</span>
-                {c.slackEnabled && c.slackWorkspaces.length > 0 ? (
-                  <span className="text-xs text-emerald-600 truncate">
-                    {c.slackWorkspaces.map(w => w.name).join(', ')}
-                  </span>
-                ) : (
-                  <span className="text-xs text-muted-foreground truncate">
-                    Send messages and view channels
-                  </span>
-                )}
-              </div>
-            </div>
-            <div className="shrink-0 flex items-center gap-2">
-              {(c.slackLoading || c.slackDiscovering) && (
-                <Loader2 className="size-3 animate-spin" />
-              )}
-              {c.slackEnabled ? (
-                <Switch
-                  checked={true}
-                  onCheckedChange={() => c.handleSlackDisable()}
-                  disabled={c.slackLoading}
-                />
-              ) : (
-                <Button
-                  variant="default"
-                  size="sm"
-                  onClick={c.handleSlackEnable}
-                  disabled={c.slackLoading || c.slackDiscovering}
-                  className="h-7 px-3 text-xs"
-                >
-                  Enable
-                </Button>
-              )}
-            </div>
-          </div>
-          {c.slackPickerOpen && (
-            <div className="mt-2 ml-12 space-y-2">
-              {c.slackDiscoverError ? (
-                <p className="text-xs text-muted-foreground">{c.slackDiscoverError}</p>
-              ) : (
-                <>
-                  {c.slackAvailableWorkspaces.map(w => (
-                    <label key={w.url} className="flex items-center gap-2 text-sm cursor-pointer">
-                      <input
-                        type="checkbox"
-                        checked={c.slackSelectedUrls.has(w.url)}
-                        onChange={(e) => {
-                          c.setSlackSelectedUrls(prev => {
-                            const next = new Set(prev)
-                            if (e.target.checked) next.add(w.url)
-                            else next.delete(w.url)
-                            return next
-                          })
-                        }}
-                        className="rounded border-border"
-                      />
-                      <span className="truncate">{w.name}</span>
-                    </label>
-                  ))}
-                  <Button
-                    size="sm"
-                    onClick={c.handleSlackSaveWorkspaces}
-                    disabled={c.slackSelectedUrls.size === 0 || c.slackLoading}
-                    className="h-7 px-3 text-xs"
-                  >
-                    Save
-                  </Button>
-                </>
-              )}
-            </div>
-          )}
-        </div>
+            {/* Fireflies */}
+            {renderOAuthProvider('fireflies-ai', 'Fireflies', <Mic className="size-4" />, 'AI meeting transcripts')}
+          </>
+        )}
       </div>
     </>
   )