   (add-hook 'flycheck-mode-hook #'my/use-eslint-from-node-modules)
   (add-hook 'js2-mode-hook #'js2-mode-hide-warnings-and-errors)
   ;; Org-mode
+  (require 'org)
   (add-hook 'org-mode-hook 'visual-line-mode)
-  )
+  (define-key org-mode-map (kbd "C-,") nil))
 
 (defun my/load-my-functions ()
   "Define my interactive functions."

  (add-hook 'eshell-mode-hook
            (lambda ()
              (eshell-cmpl-initialize)
              (define-key eshell-mode-map [remap eshell-pcomplete]  'helm-esh-pcomplete)
              (define-key eshell-mode-map (kbd "M-h") 'helm-eshell-history)
              (define-key eshell-mode-map (kbd "M-l") 'eshell/clear)))
  (add-hook 'eshell-mode-hook
            (defun my-eshell-mode-hook ()

  (unbind-key (kbd "C-m") company-active-map)
  (define-key company-active-map (kbd "TAB") #'company-complete-selection)
  (define-key company-active-map (kbd "C-h") #'backward-delete-char-untabify)
  (define-key company-active-map (kbd "C-o") #'helm-company)
  (define-key company-active-map (kbd "C-?") #'company-show-doc-buffer)
  ;; (define-key helm-company-map (kbd "C-?") #'helm-company-run-show-doc-buffer) ; does not work
  ;; Editorconfig
