diff --git a/.gitmodules b/.gitmodules
index 94c5c7e7f..f9601158e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -124,9 +124,6 @@
 [submodule "tools/torture"]
 	path = tools/torture
 	url = https://github.com/ucb-bar/riscv-torture.git
-[submodule "vlsi/hammer-mentor-plugins"]
-	path = vlsi/hammer-mentor-plugins
-	url = https://github.com/ucb-bar/hammer-mentor-plugins.git
 [submodule "tools/dsptools"]
 	path = tools/dsptools
 	url = https://github.com/ucb-bar/dsptools.git
diff --git a/scripts/init-vlsi.sh b/scripts/init-vlsi.sh
index 8925fb1a9..8452e05f0 100755
--- a/scripts/init-vlsi.sh
+++ b/scripts/init-vlsi.sh
@@ -10,9 +10,9 @@ if [[ `basename $CONDA_PREFIX` != .conda-env ]]; then
     exit
 fi
 
-# Initialize HAMMER CAD-plugins
-if [[ $1 != *openroad* ]] && [[ $2 != *openroad* ]]; then
-    git submodule update --init --recursive vlsi/hammer-mentor-plugins
+# Explicitly install mentor plugins for Calibre if you have access
+if [[ $1 == "calibre" ]]; then
+    git clone git@github.com:ucb-bar/hammer-mentor-plugins.git vlsi/hammer-mentor-plugins
     pip install -e vlsi/hammer-mentor-plugins
 fi
 
diff --git a/vlsi/hammer-mentor-plugins b/vlsi/hammer-mentor-plugins
deleted file mode 160000
index eca060af4..000000000
--- a/vlsi/hammer-mentor-plugins
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eca060af456043ded569bbcc8bea49c03bff6911