Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210819.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210819.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210819.sql	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -0,0 +1,17 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5230 Remove "add extra mark" option
+
+DELETE FROM tl_lascrt11_configuration WHERE config_key = 'isEnabledExtraPointOption';
+
+ALTER TABLE tl_lascrt11_scratchie DROP COLUMN extra_point;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -90,9 +90,6 @@
     @SortComparator(QbToolQuestion.QbToolQuestionComparator.class)
     private Set<ScratchieItem> scratchieItems = new TreeSet<>();
 
-    @Column(name = "extra_point")
-    private boolean extraPoint;
-
     @Column(name = "burning_questions_enabled")
     private boolean burningQuestionsEnabled;
 
@@ -341,14 +338,6 @@
 	this.reflectOnActivity = reflectOnActivity;
     }
 
-    public boolean isExtraPoint() {
-	return extraPoint;
-    }
-
-    public void setExtraPoint(boolean extraPoint) {
-	this.extraPoint = extraPoint;
-    }
-
     public boolean isBurningQuestionsEnabled() {
 	return burningQuestionsEnabled;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java
===================================================================
diff -u -r87ea6a14122fad745d95e49494d801d317fd6d61 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java	(.../ScratchieConfigItem.java)	(revision 87ea6a14122fad745d95e49494d801d317fd6d61)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java	(.../ScratchieConfigItem.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -34,7 +34,6 @@
 public class ScratchieConfigItem implements java.io.Serializable {
     private static final long serialVersionUID = 6360672537352753361L;
 
-    public static final String KEY_IS_ENABLED_EXTRA_POINT_OPTION = "isEnabledExtraPointOption";
     public static final String KEY_PRESET_MARKS = "presetMarks";
     public static final String KEY_HIDE_TITLES = "hideTitles";
 
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 585c5afc5fcabdb88754b7c1bd7f7ec5eef4e150)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -276,11 +276,6 @@
 	String[] presetMarks = getPresetMarks(scratchie);
 	int maxPossibleScore = (presetMarks.length > 0) ? itemsNumber * Integer.parseInt(presetMarks[0]) : 0;
 
-	// count an extra point if such option is ON
-	if (scratchie.isExtraPoint()) {
-	    maxPossibleScore += itemsNumber;
-	}
-
 	return maxPossibleScore;
     }
 
@@ -1079,11 +1074,6 @@
 		String markStr = (itemAttempts <= presetMarks.length) ? presetMarks[itemAttempts - 1]
 			: presetMarks[presetMarks.length - 1];
 		mark = Integer.parseInt(markStr);
-
-		// add extra point if needed
-		if (scratchie.isExtraPoint() && (itemAttempts == 1)) {
-		    mark++;
-		}
 	    }
 	    item.setMark(mark);
 	}
@@ -1123,7 +1113,7 @@
 	    groupSummary.setNumberColumns(numberColumns);
 
 	    Map<Long, OptionDTO> optionMap = new HashMap<>();
-	    Long i = 0l;
+	    long i = 0l;
 	    for (QbOption dbOption : options) {
 		// clone it so it doesn't interfere with values from other sessions
 		OptionDTO optionDto = new OptionDTO(dbOption);
@@ -2813,7 +2803,6 @@
 	scratchie.setDiscussionSentimentEnabled(
 		JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_DISCUSSION_SENTIMENT, false));
 	scratchie.setRelativeTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0));
-	scratchie.setExtraPoint(JsonUtil.optBoolean(toolContentJSON, "extraPoint", false));
 	scratchie.setReflectOnActivity(
 		JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE));
 	scratchie.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS));
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java
===================================================================
diff -u -r87ea6a14122fad745d95e49494d801d317fd6d61 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java	(.../AdminController.java)	(revision 87ea6a14122fad745d95e49494d801d317fd6d61)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java	(.../AdminController.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -57,12 +57,6 @@
     public String start(@ModelAttribute("scratchieAdminForm") AdminForm scratchieAdminForm,
 	    HttpServletRequest request) {
 
-	ScratchieConfigItem isEnabledExtraPointOption = scratchieService
-		.getConfigItem(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION);
-	if (isEnabledExtraPointOption != null) {
-	    scratchieAdminForm.setEnabledExtraPointOption(Boolean.valueOf(isEnabledExtraPointOption.getConfigValue()));
-	}
-
 	ScratchieConfigItem presetMarks = scratchieService.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
 	if (presetMarks != null) {
 	    scratchieAdminForm.setPresetMarks(presetMarks.getConfigValue());
@@ -87,11 +81,6 @@
 	    return "pages/admin/config";
 	}
 
-	ScratchieConfigItem isEnabledExtraPointOption = scratchieService
-		.getConfigItem(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION);
-	isEnabledExtraPointOption.setConfigValue("" + scratchieAdminForm.isEnabledExtraPointOption());
-	scratchieService.saveOrUpdateScratchieConfigItem(isEnabledExtraPointOption);
-
 	ScratchieConfigItem presetMarks = scratchieService.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
 	presetMarks.setConfigValue(scratchieAdminForm.getPresetMarks());
 	scratchieService.saveOrUpdateScratchieConfigItem(presetMarks);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -r18be7421230bdff4abe7dded93fd27c4feadf869 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 18be7421230bdff4abe7dded93fd27c4feadf869)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -160,11 +160,6 @@
 	    throw new ServletException(e);
 	}
 
-	ScratchieConfigItem isEnabledExtraPointOption = scratchieService
-		.getConfigItem(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION);
-	sessionMap.put(ScratchieConfigItem.KEY_IS_ENABLED_EXTRA_POINT_OPTION,
-		new Boolean(isEnabledExtraPointOption.getConfigValue()));
-
 	//prepare advanced option allowing to overwrite default preset marks
 	ScratchieConfigItem defaultPresetMarksConfigItem = scratchieService
 		.getConfigItem(ScratchieConfigItem.KEY_PRESET_MARKS);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java
===================================================================
diff -u -r87ea6a14122fad745d95e49494d801d317fd6d61 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java	(.../AdminForm.java)	(revision 87ea6a14122fad745d95e49494d801d317fd6d61)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java	(.../AdminForm.java)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -22,26 +22,12 @@
 
 package org.lamsfoundation.lams.tool.scratchie.web.form;
 
-/**
- *
- */
 public class AdminForm {
-    private static final long serialVersionUID = 414425664356226L;
 
-    private boolean enabledExtraPointOption;
-
     private String presetMarks;
 
     private boolean hideTitles;
 
-    public boolean isEnabledExtraPointOption() {
-	return enabledExtraPointOption;
-    }
-
-    public void setEnabledExtraPointOption(boolean isEnabledExtraPointOption) {
-	this.enabledExtraPointOption = isEnabledExtraPointOption;
-    }
-
     public String getPresetMarks() {
 	return presetMarks;
     }
Index: lams_tool_scratchie/web/pages/admin/config.jsp
===================================================================
diff -u -r87ea6a14122fad745d95e49494d801d317fd6d61 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision 87ea6a14122fad745d95e49494d801d317fd6d61)
+++ lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -24,11 +24,6 @@
 			</c:if>
 			
 			<form:form action="/lams/tool/lascrt11/admin/saveContent.do" modelAttribute="scratchieAdminForm" id="scratchieAdminForm" method="post" enctype="multipart/form-data">
-				<div class="checkbox">
-					<label>
-					<form:checkbox path="enabledExtraPointOption"/>
-					<fmt:message key="admin.extra.mark" /></label>
-				</div>
 				<div class="form-group">
 					<label for="presetMarks"><fmt:message key="admin.preset.marks" /></label>
 					<form:input path="presetMarks" size="50" maxlength="255" cssClass="form-control form-control-inline" />
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r5ada1d7bd1c23215a124e16d27ceb8daf9600977 -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 5ada1d7bd1c23215a124e16d27ceb8daf9600977)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -65,15 +65,6 @@
     <div class="row">
         <div class="col-sm-6">
 
-            <c:if test="${sessionMap.isEnabledExtraPointOption}">
-                <div class="checkbox">
-                    <label for="extraPoint">
-                        <form:checkbox path="scratchie.extraPoint" id="extraPoint"/>
-                        <fmt:message key="label.authoring.advanced.give.extra.point" />
-                    </label>
-                </div>
-            </c:if>
-
             <div class="checkbox">
                 <label for="burning-questions-enabled">
                     <form:checkbox path="scratchie.burningQuestionsEnabled" id="burning-questions-enabled"/>
Index: lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -rfda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d -r7276ea4054a0e0a542c4845123b24ec0b5a1e195
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision fda4332af5bb7bc2f0dcae0db3c5b5fe1a1ed92d)
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
@@ -6,23 +6,6 @@
 <table class="table table-striped table-condensed">
 	<tr>
 		<td>
-			<fmt:message key="label.authoring.advanced.give.extra.point" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${sessionMap.scratchie.extraPoint}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
 			<fmt:message key="label.authoring.advanced.burning.questions" />
 		</td>