diff --git a/rekahsoft-gnu/packages/emacs-xyz.scm b/rekahsoft-gnu/packages/emacs-xyz.scm
index 681fe94..43e91a4 100644
--- a/rekahsoft-gnu/packages/emacs-xyz.scm
+++ b/rekahsoft-gnu/packages/emacs-xyz.scm
@@ -867,59 +867,3 @@ dashboard!")
       (description
        "Displays icons for all buffers in ibuffer")
       (license license:gpl3+)))
-
-;; TODO: Upstream candidate
-(define-public emacs-yaml
-  (package
-    (name "emacs-yaml")
-    (version "0.3.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/zkry/yaml.el.git")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx"))))
-    (build-system emacs-build-system)
-    (home-page "https://github.com/zkry/yaml.el")
-    (synopsis "YAML parser for Elisp")
-    (description
-     "yaml.el contains the code for parsing YAML natively in Elisp with
-no dependencies.  The main function to parse YAML provided is
-`yaml-parse-string'.  `yaml-encode' is also provided to encode a
-Lisp object to YAML.  The following are some examples of its usage:
-
-(yaml-parse-string \"key1: value1\
-key2: value2\")
-(yaml-parse-string \"key1: value1\
-key2: value2\" :object-type 'alist)
-(yaml-parse-string \"numbers: [1, 2, 3]\" :sequence-type 'list)
-
-(yaml-encode '((count . 3) (value . 10) (items (\"ruby\" \"diamond\"))))
-")
-    (license license:gpl3)))
-
-;; TODO: this can be removed and the guix channel can be used once a new version
-;;       of emacs-forge is published (a version after 0.2.1)
-(define-public emacs-forge-0.2.1-8264234d
-  (let ((commit "8264234db61b8a7f427b972aaef6235f9f6a13fa")
-        (revision "1"))
-    (package
-      (inherit emacs-forge)
-      (name "emacs-forge")
-      (version (git-version "0.2.1" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/magit/forge")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "0fw2v05bxjkya78jms7n3jdzf04plr1piwh9z92an7421m7mjkdj"))))
-      (propagated-inputs
-       `(,@(package-propagated-inputs emacs-forge)
-         ("emacs-yaml" ,emacs-yaml))))))