   (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."

  (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-.") #'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

  (setq hl-paren-colors '("Springgreen3"))
  (setq spacemacs-show-trailing-whitespace nil)
  (setq show-trailing-whitespace nil)
  (setq-default truncate-lines t)
  (spacemacs/toggle-highlight-current-line-globally-off)
  ;; Scrolling
  (setq scroll-margin 2)
