diff --git a/Cask b/Cask
index df5affa4d..486ba8d7e 100644
--- a/Cask
+++ b/Cask
@@ -74,8 +74,6 @@
 
 ;; VCS --- core/core-vcs.el
 (depends-on "diff-hl")
-(depends-on "git-commit-mode")
-(depends-on "git-rebase-mode")
 (depends-on "gitconfig-mode")
 (depends-on "gitignore-mode")
 
@@ -148,7 +146,6 @@
 (depends-on "go-mode")
 (depends-on "swift-mode")
 (depends-on "vimrc-mode")
-(depends-on "nand2tetris" :git "https://github.com/CestDiego/nand2tetris.el")
 
 ;; (depends-on "haxe-mode")
 ;; (depends-on "rust-mode")
diff --git a/core/core-vcs.el b/core/core-vcs.el
index d659bec7e..e2801062c 100644
--- a/core/core-vcs.el
+++ b/core/core-vcs.el
@@ -1,19 +1,5 @@
 ;;; core-vcs.el --- version control awareness
 
-(use-package git-commit-mode            ;
-  :mode ("/COMMIT_EDITMSG$"
-         "/NOTES_EDITMSG$"
-         "/MERGE_MSG$"
-         "/TAG_EDITMSG$"
-         "/PULLREQ_EDITMSG$")
-  :config
-  (evil-set-initial-state 'git-commit-mode 'insert))
-
-(use-package git-rebase-mode
-  :mode "/git-rebase-todo$"
-  :config
-  (evil-set-initial-state 'git-rebase-mode 'insert))
-
 (use-package gitconfig-mode
   :mode ("/\\.?git/?config$" "/\\.gitmodules$")
   :init (add-hook 'gitconfig-mode-hook 'flyspell-mode))