diff --git a/global.org b/global.org
index 072726d..d5a510f 100644
--- a/global.org
+++ b/global.org
@@ -359,9 +359,6 @@
                             (concat emacs-dir basename)
                           (concat "~/.emacs-" basename)))))
 
-  (global-set-key (kbd "<f13>") 'set-mark-command)
-  (global-set-key (kbd "<f14>") 'set-mark-command)
-
   ;;(setq help-char (kbd "H-h")
   (global-set-key (kbd "M-h") 'backward-kill-word)
   (global-set-key (kbd "C-M-h") 'backward-kill-sexp)
@@ -377,32 +374,18 @@
   This is the same as using \\[set-mark-command] with the prefix argument."
     (interactive)
     (set-mark-command 1))
-  (global-set-key (kbd "<M-f13>") 'jump-to-mark)
-  (global-set-key (kbd "<M-f14>") 'jump-to-mark)
 
   (defun just-activate-mark ()
     (interactive)
     (activate-mark))
 
+  (global-set-key (kbd "<M-f13>") 'jump-to-mark)
+  (global-set-key (kbd "<M-f14>") 'jump-to-mark)
+  (global-set-key (kbd "<f13>") 'set-mark-command)
+  (global-set-key (kbd "<f14>") 'set-mark-command)
   (global-set-key (kbd "<S-f13>") 'just-activate-mark)
   (global-set-key (kbd "<S-f14>") 'just-activate-mark)
 
-  ;; (defun exchange-point-and-mark-no-activate ()
-  ;;   "Identical to \\[exchange-point-and-mark] but will not activate the region."
-  ;;   (interactive)
-  ;;   (exchange-point-and-mark)
-  ;;   (deactivate-mark nil))
-  ;; (define-key global-map [remap exchange-point-and-mark] 'exchange-point-and-mark-no-activate)
-
-  ;; ** This function is not needed since we are not using transient mode anymore
-  ;; (defun push-mark-no-activate ()
-  ;;   "Pushes `point' to `mark-ring' and does not activate the region
-  ;; Equivalent to \\[set-mark-command] when \\[transient-mark-mode] is disabled"
-  ;;   (interactive)
-  ;;   (push-mark (point) t nil)
-  ;;   (message "Pushed mark to ring"))
-  ;; (global-set-key (kbd "<C-f13>") 'push-mark-no-activate)
-
   ;; * Wordnik                                                          :fixme:
   (require 'wordnik-synonym)
   (global-set-key (kbd "H-=") 'wn/synonym-at-point)
@@ -414,10 +397,6 @@
                       (kill-buffer buffer)))
                ))
 
-  ;; * Open gpg encrypted files on the fly
-  ;;(require 'epa-file)
-  ;;(epa-file-enable)
-
   ;; * Time stamps
   ;; write
   ;;   Time-stamp: <>
@@ -435,28 +414,6 @@
 
   (setq echo-keystrokes 0.10)
 
-  ;; * Try again with ido
-  ;; ** Load ido
-  ;;(require 'ido)
-  ;;(ido-mode t)
-  ;; ** Organize ibuffer according to some rules
-  ;;(setq ibuffer-saved-filter-groups
-  ;;      (quote (("default"
-  ;;             ("LaTeχ" (mode . latex-mode))
-  ;;             ("Magit" (name . "^\\*magit.*$"))
-  ;;             ("elisp" (mode . emacs-lisp-mode))
-  ;;             ("org" (mode . org-mode))
-  ;;             ("emacs" (or
-  ;;                       (name . "^\\*scratch\\*$")
-  ;;                       (name . "^\\*Messages\\*$")
-  ;;                       (name . "^\\*compilation\\*$")))))))
-  ;;
-  ;;(add-hook 'ibuffer-mode-hook
-  ;;        '(lambda ()
-  ;;           (ibuffer-switch-to-saved-filter-groups "default")))
-
-
-
   (require 'package)
   (add-to-list 'package-archives
                '("melpa-stable" . "http://stable.melpa.org/packages/") t)