diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el
index 3dbd72bc2..6d965dcd0 100644
--- a/modules/lang/org/config.el
+++ b/modules/lang/org/config.el
@@ -546,6 +546,7 @@ between the two."
           "/" #'helm-org-agenda-files-headings)
         "a" #'org-attach
         "d" #'org-deadline
+        "e" #'org-export-dispatch
         "f" #'org-footnote-new
         "h" #'org-toggle-heading
         "i" #'org-toggle-item
@@ -569,17 +570,6 @@ between the two."
           "x" #'org-clock-cancel
           "=" #'org-clock-timestamps-up
           "-" #'org-clock-timestamps-down)
-        (:prefix ("e" . "export")
-          :desc "to html"             "h" #'org-html-export-to-html
-          :desc "to html & open"      "H" #'org-html-export-as-html
-          :desc "to markdown"         "m" #'org-md-export-to-markdown
-          :desc "to markdown & open"  "M" #'org-md-export-as-markdown
-          :desc "to reveal.js"        "r" #'org-reveal-export-to-html
-          :desc "to reveal.js & open" "R" #'org-reveal-export-to-html-and-browse
-          (:prefix ("b" . "from beamer")
-            :desc "to latex"            "l" #'org-beamer-export-to-latex
-            :desc "to latex & open"     "L" #'org-beamer-export-as-latex
-            :desc "as pdf"              "p" #'org-beamer-export-to-pdf))
         (:prefix ("g" . "goto")
           "g" #'org-goto
           (:when (featurep! :completion ivy)
diff --git a/modules/lang/org/contrib/hugo.el b/modules/lang/org/contrib/hugo.el
index c466be339..b0a732c64 100644
--- a/modules/lang/org/contrib/hugo.el
+++ b/modules/lang/org/contrib/hugo.el
@@ -2,16 +2,4 @@
 ;;;###if (featurep! +hugo)
 
 (use-package! ox-hugo
-  :after ox
-  :preface
-  (map! :after org
-        :map org-mode-map
-        :localleader
-        (:prefix "e"
-          (:prefix ("H" . "hugo")
-            :desc "Subtree or File to Md to file"        "H" #'org-hugo-export-wim-to-md
-            :desc "File to Md file"                      "h" #'org-hugo-export-to-md
-            :desc "Subtree or File to Md to file & open" "O" (λ! (org-open-file (org-hugo-export-wim-to-md)))
-            :desc "File to Md file & open"               "o" (λ! (org-open-file (org-hugo-export-to-md)))
-            :desc "All subtrees (or File) to Md file(s)" "A" (λ! (org-hugo-export-wim-to-md :all-subtrees))
-            :desc "File to a temporary Md buffer"        "t" #'org-hugo-export-as-md))))
+  :after ox)