diff --git a/build/modules.conf.in b/build/modules.conf.in
index 71ece983ef..66b649f6f3 100644
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -4,7 +4,7 @@
 #applications/mod_blacklist
 #applications/mod_callcenter
 #applications/mod_cidlookup
-applications/mod_cluechoo
+#applications/mod_cluechoo
 applications/mod_commands
 applications/mod_conference
 #applications/mod_curl
diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index d8a0b5cc68..e5a297e8af 100644
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -60,7 +60,7 @@
     <!--<load module="mod_easyroute"/>-->
     <load module="mod_esf"/>
     <load module="mod_fsv"/>
-    <load module="mod_cluechoo"/>
+    <!--<load module="mod_cluechoo"/>-->
     <load module="mod_valet_parking"/>
     <!--<load module="mod_fsk"/>-->
     <!--<load module="mod_spy"/>-->
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index e9b77825a0..bc7da61c3f 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -15,6 +15,7 @@ avoid_mods=(
   applications/mod_osp
   applications/mod_rad_auth
   applications/mod_skel
+  applications/mod_cluechoo
   asr_tts/mod_cepstral
   codecs/mod_com_g729
   codecs/mod_ilbc
@@ -433,7 +434,6 @@ Depends: \${misc:Depends}, freeswitch (= \${binary:Version}),
  freeswitch-mod-voicemail (= \${binary:Version}),
  freeswitch-mod-esf (= \${binary:Version}),
  freeswitch-mod-fsv (= \${binary:Version}),
- freeswitch-mod-cluechoo (= \${binary:Version}),
  freeswitch-mod-valet-parking (= \${binary:Version}),
  freeswitch-mod-httapi (= \${binary:Version}),
  freeswitch-mod-dialplan-xml (= \${binary:Version}),
@@ -564,7 +564,6 @@ Recommends:
  freeswitch-mod-blacklist (= \${binary:Version}),
  freeswitch-mod-callcenter (= \${binary:Version}),
  freeswitch-mod-cidlookup (= \${binary:Version}),
- freeswitch-mod-cluechoo (= \${binary:Version}),
  freeswitch-mod-commands (= \${binary:Version}),
  freeswitch-mod-conference (= \${binary:Version}),
  freeswitch-mod-curl (= \${binary:Version}),
diff --git a/debian/control-modules b/debian/control-modules
index 9246317117..715565c811 100644
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -30,11 +30,6 @@ Description: Caller ID name lookup
  This module provides an API for querying caller ID name and location
  data.
 
-Module: applications/mod_cluechoo
-Description: Clue Choo
- This demo module renders a Clue Choo train on the FreeSWITCH console.
-Build-Depends: libncurses5-dev
-
 Module: applications/mod_commands
 Description: Command module
  This module provides miscellaneous API commands.