diff --git a/lib/layouts/theorems-ams-extended-bytype.module b/lib/layouts/theorems-ams-extended-bytype.module
index 1b8eb52f41..b887a21d63 100644
--- a/lib/layouts/theorems-ams-extended-bytype.module
+++ b/lib/layouts/theorems-ams-extended-bytype.module
@@ -33,7 +33,6 @@ Requires	amsmath
 # - Acknowledgement
 # - Conclusion
 # - Assumption
-# - Question
 
 # We need separate counters for each theorem-like style.
 Counter criterion
@@ -56,8 +55,6 @@ Counter conclusion
 End
 Counter assumption
 End
-Counter question
-End
 
 
 Style Criterion
@@ -408,38 +405,4 @@ Style Assumption*
 	EndBabelPreamble
 End
 
-Style Question
-	CopyStyle             Theorem
-	DependsOn             Theorem
-	LatexName             question
-	LabelString           "Question \thequestion."
-	Preamble
-	  \theoremstyle{plain}
-	  \newtheorem{question}{\protect\questionname}
-	EndPreamble
-	LangPreamble
-	  \providecommand{\questionname}{_(Question)}
-	EndLangPreamble
-	BabelPreamble
-	  \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
-	EndBabelPreamble
-	LabelCounter          question
-End
-
-Style Question*
-	CopyStyle             Theorem*
-	LatexName             question*
-	LabelString           "Question."
-	Preamble
-	  \theoremstyle{plain}
-	  \newtheorem*{question*}{\protect\questionname}
-	EndPreamble
-	LangPreamble
-	  \providecommand{\questionname}{_(Question)}
-	EndLangPreamble
-	BabelPreamble
-	  \addto\captions$$lang{\renewcommand{\questionname}{_(Question)}}
-	EndBabelPreamble
-End
-
 Input theorems-refprefix.inc
diff --git a/lib/layouts/theorems-refprefix.inc b/lib/layouts/theorems-refprefix.inc
index fea3f19315..be67cc0e83 100644
--- a/lib/layouts/theorems-refprefix.inc
+++ b/lib/layouts/theorems-refprefix.inc
@@ -89,8 +89,3 @@ End
 IfStyle Assumption
 	RefPrefix assu
 End
-
-
-IfStyle Question
-	RefPrefix que
-End