diff --git a/config.el b/config.el
index 37e2224..20aa5fc 100644
--- a/config.el
+++ b/config.el
@@ -10,6 +10,3 @@
 ;;; License: GPLv3
 
 ;; Variables
-
-(spacemacs|defvar-company-backends irony-mode)
-(spacemacs|defvar-company-backends irony-mode)
diff --git a/packages.el b/packages.el
index 7618a35..4fc86a4 100644
--- a/packages.el
+++ b/packages.el
@@ -11,9 +11,8 @@
 
 (defconst platformio-packages
   '(
-    company
     irony
-    company-irony
+    (company-irony :toggle (configuration-layer/package-used-p 'company))
     irony-eldoc
     platformio-mode
     ))
@@ -36,7 +35,9 @@
   (use-package company-irony
     :defer t
     :init
-    (push 'company-irony company-backends-irony-mode)))
+    (spacemacs|add-company-backends
+       :backends company-irony
+       :modes irony-mode)))
 
 (defun platformio/init-irony-eldoc ()
   (use-package irony-eldoc
@@ -44,9 +45,6 @@
     :init
     (add-hook 'irony-mode-hook 'irony-eldoc)))
 
-(defun platformio/post-init-company ()
-  (spacemacs|add-company-hook irony-mode))
-
 (defun platformio/init-platformio-mode ()
   (use-package platformio-mode
     :commands platformio-conditionally-enable