diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 29323a84d4df8ff6cc95e180bc61cf9aa98771eb..eebf99f8c95d5d59a08bdafaa9a46f3dc2f275c2 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -82,21 +82,12 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.mathjax.src:}")
 	private String mathJaxSrc;
 
-	@Value("${features.markdown.enabled:false}")
-	private String markdownEnabled;
-
-	@Value("${features.learning-progress.enabled:false}")
-	private String learningProgressEnabled;
-
 	@Value("${features.students-own-questions.enabled:false}")
 	private String studentsOwnQuestions;
 
 	@Value("${features.freetext-imageanswer.enabled:false}")
 	private String imageAnswerEnabled;
 
-	@Value("${features.question-format.flashcard.enabled:false}")
-	private String flashcardEnabled;
-
 	@Value("${features.question-format.grid-square.enabled:false}")
 	private String gridSquareEnabled;
 
@@ -230,10 +221,10 @@ public class ConfigurationController extends AbstractController {
 		config.put("features", features);
 
 		features.put("mathJax", "true".equals(mathJaxEnabled));
-		features.put("markdown", "true".equals(markdownEnabled));
+		/* Keep the markdown property for now since the frontend still depends on it */
+		features.put("markdown", true);
 		features.put("studentsOwnQuestions", "true".equals(studentsOwnQuestions));
 		features.put("imageAnswer", "true".equals(imageAnswerEnabled));
-		features.put("flashcard", "true".equals(flashcardEnabled));
 		features.put("gridSquare", "true".equals(gridSquareEnabled));
 		features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
 		features.put("publicPool", "true".equals(publicPoolEnabled));
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 450ab14d81130b3dab1e04b69404ebb19c592140..2dc5421a5070a2e4b2086e1f4a4533021f097e64 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -177,16 +177,12 @@ connector.password=test
 features.mathjax.enabled=true
 features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 
-# Enable Markdown for text formatting, links and embedded media
-features.markdown.enabled=true
-
 # The following features are considered experimental because they have not been
 # tested in a production environment over a longer time frame and/or their
 # behavior will change in future releases.
 #
 features.students-own-questions.enabled=true
 features.freetext-imageanswer.enabled=true
-features.question-format.flashcard.enabled=true
 features.question-format.grid-square.enabled=true
 
 # Without enabled session-import-export feature no sessions can be added to the
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 450ab14d81130b3dab1e04b69404ebb19c592140..2dc5421a5070a2e4b2086e1f4a4533021f097e64 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -177,16 +177,12 @@ connector.password=test
 features.mathjax.enabled=true
 features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 
-# Enable Markdown for text formatting, links and embedded media
-features.markdown.enabled=true
-
 # The following features are considered experimental because they have not been
 # tested in a production environment over a longer time frame and/or their
 # behavior will change in future releases.
 #
 features.students-own-questions.enabled=true
 features.freetext-imageanswer.enabled=true
-features.question-format.flashcard.enabled=true
 features.question-format.grid-square.enabled=true
 
 # Without enabled session-import-export feature no sessions can be added to the