diff --git a/.travis.yml b/.travis.yml
index ae1ee7b15..2a22bd66b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,22 +61,6 @@ env:
     BUILDNAME="SMALL+NOTABLES"
     BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
     BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="CLEANSTACK"
-    BUILDOPTIONS="-DLTC_CLEAN_STACK"
-    BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="CLEANSTACK+SMALL"
-    BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
-    BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="CLEANSTACK+NOTABLES"
-    BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
-    BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="CLEANSTACK+NOTABLES+SMALL"
-    BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
-    BUILDSCRIPT=".ci/run.sh"
   - |
     BUILDNAME="NO_FAST"
     BUILDOPTIONS="-DLTC_NO_FAST"
@@ -93,18 +77,10 @@ env:
     BUILDNAME="NO_TIMING_RESISTANCE"
     BUILDOPTIONS="-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
     BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
-    BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC"
-    BUILDSCRIPT=".ci/run.sh"
   - |
     BUILDNAME="PTHREAD"
     BUILDOPTIONS="-DLTC_PTHREAD"
     BUILDSCRIPT=".ci/run.sh"
-  - |
-    BUILDNAME="PTHREAD+CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+LTC_FORTUNA_RESEED_RATELIMIT_STATIC"
-    BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_FORTUNA_RESEED_RATELIMIT_STATIC -DLTC_PTHREAD"
-    BUILDSCRIPT=".ci/run.sh"
   - |
     BUILDNAME="STOCK+ARGTYPE=1"
     BUILDOPTIONS="-DARGTYPE=1"
diff --git a/src/headers/tomcrypt_custom.h b/src/headers/tomcrypt_custom.h
index 77984e583..b13c2e08f 100644
--- a/src/headers/tomcrypt_custom.h
+++ b/src/headers/tomcrypt_custom.h
@@ -585,6 +585,11 @@
    #define LTC_PBES
 #endif
 
+#if defined(LTC_CLEAN_STACK)
+/* if you're sure that you want to use it, remove the line below */
+   #error LTC_CLEAN_STACK is considered as broken
+#endif
+
 #if defined(LTC_PBES) && !defined(LTC_PKCS_5)
    #error LTC_PBES requires LTC_PKCS_5
 #endif