diff --git a/modules/cc-init.el b/modules/cc-init.el
index 28d511ee..5d130183 100644
--- a/modules/cc-init.el
+++ b/modules/cc-init.el
@@ -136,7 +136,7 @@
 
   (use-package flycheck-google-cpplint ; Google C++ Style checker for Flycheck, also need to setup cpplint.
     :ensure t
-    :after flycheck
+    ;; :after flycheck
     :if (eq system-type 'gnu/linux)
     :config
     (flycheck-add-next-checker 'c/c++-clang
@@ -150,6 +150,7 @@
          :map c-mode-base-map
          ("M-q" . c-fill-paragraph)))
 
+;; Example to install irony-server: cmake -DLIBCLANG_INCLUDE_DIR=/workspace/software/llvm/clang+llvm-3.9.1-x86_64-linux-gnu-debian8/include -DLIBCLANG_LIBRARY=/usr/lib64/llvm/libclang.so -DCMAKE_INSTALL_PREFIX=/h2/sbiswas/.emacs.d/irony/ /h2/sbiswas/.emacs.d/elpa/irony-20161227.348/server && cmake --build . --use-stderr --config Release --target install
 (use-package irony
   :ensure t
   :diminish irony-mode
diff --git a/modules/latex-init.el b/modules/latex-init.el
index 8dbd2bdb..72894818 100644
--- a/modules/latex-init.el
+++ b/modules/latex-init.el
@@ -236,21 +236,6 @@
                                       "~/iss-workspace/bibtex/iss.bib"
                                       "~/iss-workspace/NSFApprox2016/bibs/pingali/approx.bib")))
 
-(use-package outline
-  :ensure t
-  :disabled t
-  :after tex
-  :defer t
-  :diminish outline-minor-mode
-  :init (add-hook 'LaTeX-mode-hook #'outline-minor-mode)
-  :config
-  (use-package outline-magic
-    :ensure t
-    :init
-    (add-hook 'outline-mode-hook
-              (lambda ()
-                (require 'outline-cycle)))))
-
 ;; https://rtime.felk.cvut.cz/~sojka/blog/compile-on-save/
 ;; http://tex.stackexchange.com/questions/64897/automatically-run-latex-command-after-saving-tex-file-in-emacs
 ;; This hook works well for paper directories, but not with dissertation directories.
diff --git a/modules/prog-init.el b/modules/prog-init.el
index 905ea75f..3688a36f 100644
--- a/modules/prog-init.el
+++ b/modules/prog-init.el
@@ -252,16 +252,10 @@
 
 (use-package cmake-mode
   :ensure t
+  :defer t
   :config
   (use-package cmake-font-lock
-    :ensure t)
-  (use-package cpputils-cmake
-    :ensure t
-    :config
-    (add-hook 'c-mode-common-hook
-              (lambda ()
-                (if (derived-mode-p 'c-mode 'c++-mode)
-                    (cppcm-reload-all))))))
+    :ensure t))
 
   (provide 'prog-init)