Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20181216.sql
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20181216.sql	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20181216.sql	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -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-4707 Remove never used fields from TaskListItem
+ALTER TABLE tl_latask10_tasklist_item DROP COLUMN show_comments_to_all,
+	DROP COLUMN is_comments_files_allowed;
+
+UPDATE lams_tool SET tool_version='20181216' WHERE tool_signature='latask10';
+
+----------------------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;
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java
===================================================================
diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java	(.../TaskListItem.java)	(revision 0b3631fb6cd93265967ec5d314313e15999d9061)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java	(.../TaskListItem.java)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -106,13 +106,6 @@
     
     @Column(name = "parent_task_name")
     private String parentTaskName;
-    
-    // advanced options that are not used now
-    @Column(name = "is_comments_files_allowed")
-    private boolean isCommentsFilesAllowed;
-    
-    @Column(name = "show_comments_to_all")
-    private boolean showCommentsToAll;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "taskList_item_uid")
@@ -354,24 +347,6 @@
 	this.parentTaskName = parentTaskName;
     }
 
-    public boolean getShowCommentsToAll() {
-	return showCommentsToAll;
-    }
-
-    public void setShowCommentsToAll(boolean showCommentsToAll) {
-	this.showCommentsToAll = showCommentsToAll;
-    }
-
-    public boolean isCommentsFilesAllowed() {
-	// true bacause we can not set it from the UI
-	// TODO get rid of this later
-	return true;
-    }
-
-    public void setCommentsFilesAllowed(boolean isCommentsFilesAllowed) {
-	this.isCommentsFilesAllowed = isCommentsFilesAllowed;
-    }
-
     /**
      * @return a set of Attachments to this TaskListItem.
      */
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java	(.../TaskListImportContentVersionFilter.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListImportContentVersionFilter.java	(.../TaskListImportContentVersionFilter.java)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -25,6 +25,7 @@
 
 import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
+import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
 
 /**
  * Import filter class for different version of TaskList content.
@@ -40,4 +41,12 @@
 	this.removeField(TaskList.class, "offlineInstructions");
 	this.removeField(TaskList.class, "attachments");
     }
+    
+    /**
+     * Import 20110510 version content to 20140102 version tool server.
+     */
+    public void up20180425To20181216() {
+	this.removeField(TaskListItem.class, "showCommentsToAll");
+	this.removeField(TaskListItem.class, "commentsFilesAllowed");
+    }
 }
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
===================================================================
diff -u -r8fb34ff788990c3ae25a0661090636b38bdecec2 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 8fb34ff788990c3ae25a0661090636b38bdecec2)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -604,10 +604,6 @@
 	taskListItemForm.setCommentsRequired(item.isCommentsRequired());
 	taskListItemForm.setFilesAllowed(item.isFilesAllowed());
 	taskListItemForm.setFilesRequired(item.isFilesRequired());
-	// The next 2 options always will be true (as it set in jsp). Waiting
-	// for the final decision -- if this options will be needed later.
-	taskListItemForm.setCommentsFilesAllowed(item.isCommentsFilesAllowed());
-	taskListItemForm.setShowCommentsToAll(item.getShowCommentsToAll());
 	taskListItemForm.setChildTask(item.isChildTask());
 	taskListItemForm.setParentTaskName(item.getParentTaskName());
     }
@@ -654,10 +650,6 @@
 	item.setCommentsRequired(itemForm.isCommentsRequired());
 	item.setFilesAllowed(itemForm.isFilesAllowed());
 	item.setFilesRequired(itemForm.isFilesRequired());
-	// The next 2 options always will be true (as it set in jsp). Waiting
-	// for the final decision -- if this options will be needed later.
-	item.setCommentsFilesAllowed(itemForm.isCommentsFilesAllowed());
-	item.setShowCommentsToAll(itemForm.getShowCommentsToAll());
 	item.setChildTask(itemForm.isChildTask());
 	item.setParentTaskName(itemForm.getParentTaskName());
     }
@@ -683,8 +675,6 @@
 	itemPO.setCommentsRequired(itemFromSession.isCommentsRequired());
 	itemPO.setFilesAllowed(itemFromSession.isFilesAllowed());
 	itemPO.setFilesRequired(itemFromSession.isFilesRequired());
-	itemPO.setCommentsFilesAllowed(itemFromSession.isCommentsFilesAllowed());
-	itemPO.setShowCommentsToAll(itemFromSession.getShowCommentsToAll());
 	itemPO.setChildTask(itemFromSession.isChildTask());
 	itemPO.setParentTaskName(itemFromSession.getParentTaskName());
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java	(.../TaskListItemForm.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java	(.../TaskListItemForm.java)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -50,11 +50,6 @@
     private boolean isFilesRequired;
     private boolean isChildTask;
 
-    // The next 2 options always will be true (as it set in jsp). Waiting
-    // for the final decision -- if this options will be needed later.
-    private boolean isCommentsFilesAllowed;
-    private boolean showCommentsToAll;
-
     private String parentTaskName;
 
     private MultipartFile uploadedFile;
@@ -250,49 +245,7 @@
 	this.isFilesRequired = isFilesRequired;
     }
 
-    // The next 2 options always will be true (as it set in jsp). Waiting
-    // for the final decision -- if this options will be needed later.
     /**
-     * Returns whether comments are allowed in this <code>TaskLiskItem</code>.
-     *
-     * @return true if comments are allowed in this <code>TaskLiskItem</code>, false otherwise.
-     */
-    public boolean isCommentsFilesAllowed() {
-	return isCommentsFilesAllowed;
-    }
-
-    /**
-     * Sets whether comments are allowed in this <code>TaskLiskItem</code>.
-     *
-     * @param isCommentsAllowed
-     *            true if comments are allowed in this <code>TaskLiskItem</code>, false otherwise.
-     */
-    public void setCommentsFilesAllowed(boolean isCommentsFilesAllowed) {
-	this.isCommentsFilesAllowed = isCommentsFilesAllowed;
-    }
-
-    /**
-     * Returns whether comments are allowed to be shown to everybody for this <code>TaskLiskItem</code>.
-     *
-     * @return true if comments are allowed to be shown to everybody for this <code>TaskLiskItem</code>, false
-     *         otherwise.
-     */
-    public boolean getShowCommentsToAll() {
-	return showCommentsToAll;
-    }
-
-    /**
-     * Sets whether comments are allowed to be shown to everybody for this <code>TaskLiskItem</code> or not.
-     *
-     * @param showCommentsToAll
-     *            true if comments are allowed to be shown to everybody for this <code>TaskLiskItem</code>, false
-     *            otherwise.
-     */
-    public void setShowCommentsToAll(boolean showCommentsToAll) {
-	this.showCommentsToAll = showCommentsToAll;
-    }
-
-    /**
      * Returns whether this <code>TaskLiskItem</code> is a child task.
      *
      * @return true if this <code>TaskLiskItem</code> is a child task, false otherwise.
Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_task/web/pages/authoring/parts/addtask.jsp	(.../addtask.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -29,11 +29,8 @@
 			<lams:errors/>
 
 			<form:form action="saveOrUpdateItem.do" modelAttribute="taskListItemForm" method="post" id="taskListItemForm" focus="title" >
-	
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="itemIndex" />
-				<form:hidden path="commentsFilesAllowed" value="true"/>
-				<form:hidden path="showCommentsToAll" value="true" />
 				
 				<div class="form-group">
 	            	<label for="title">
Index: lams_tool_task/web/pages/learning/parts/commentlist.jsp
===================================================================
diff -u -r05ca651c349107219646dcafaf444401fa2c055e -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 05ca651c349107219646dcafaf444401fa2c055e)
+++ lams_tool_task/web/pages/learning/parts/commentlist.jsp	(.../commentlist.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -12,8 +12,7 @@
 
 <c:forEach var="comment" items="${commentList}">
 
-	<c:if
-		test="${item.showCommentsToAll || (sessionMap.userLogin == comment.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
+	<c:if test="${(sessionMap.userLogin == comment.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
 		<div class="row voffset5">
 			<div class="col-xs-12">
 				<div class="panel panel-default">
Index: lams_tool_task/web/pages/learning/parts/filelist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/web/pages/learning/parts/filelist.jsp	(.../filelist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/learning/parts/filelist.jsp	(.../filelist.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -9,8 +9,7 @@
 		<%-- Display target file type --%>
 		<ul>
 			<c:forEach var="file" items="${fileList}">
-				<c:if
-					test="${item.showCommentsToAll || (sessionMap.userLogin == file.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
+				<c:if test="${(sessionMap.userLogin == file.createBy.loginName) || (sessionMap.mode == 'teacher') || (sessionMap.mode == 'author')}">
 
 					<li><c:out value="${file.fileName}" escapeXml="true" /> <c:if test="${file.createBy != null}">
 						[<c:out value="${file.createBy.firstName} ${file.createBy.lastName}" escapeXml="true" />]
Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp
===================================================================
diff -u -r0b3631fb6cd93265967ec5d314313e15999d9061 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision 0b3631fb6cd93265967ec5d314313e15999d9061)
+++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp	(.../itemdetails.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -2,66 +2,60 @@
 	<div class="col-xs-12">
 		<div class="panel-body">${item.description}</div>
 
-		<c:if test="${item.commentsFilesAllowed}">
-			<hr class="msg-hr">
-			<!-- Comments Part -->
-			<c:if test="${item.commentsAllowed}">
-				<form:form action="addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+		<hr class="msg-hr">
+		<!-- Comments Part -->
+		<c:if test="${item.commentsAllowed}">
+			<form:form action="addNewComment.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
 					modelAttribute="taskListItemForm" method="post" enctype="multipart/form-data" onsubmit="disableButtons()">
 
-					<%@ include file="commentlist.jsp"%>
+				<%@ include file="commentlist.jsp"%>
 
-					<c:if test="${mode != 'teacher'}">
+				<c:if test="${mode != 'teacher'}">
 
-						<div class="form-group voffset5">
-							<label for="comment-${item.uid}">
-								<fmt:message key="label.preview.add.comment" />
-							</label>
-							<lams:textarea name="comment" rows="2" id="comment-${item.uid}" class="form-control" index="${item.uid}"></lams:textarea>
+					<div class="form-group voffset5">
+						<label for="comment-${item.uid}">
+							<fmt:message key="label.preview.add.comment" />
+						</label>
+						<lams:textarea name="comment" rows="2" id="comment-${item.uid}" class="form-control" index="${item.uid}"></lams:textarea>
 							
-							<c:if test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
-								<div class="help-block">
-									<fmt:message key="label.learning.info.add.comment.required" />
-								</div>
-							</c:if>
+						<c:if test="${(mode != 'teacher') && !itemDTO.commentRequirementsMet}">
+							<div class="help-block">
+								<fmt:message key="label.learning.info.add.comment.required" />
+							</div>
+						</c:if>
 
-							<input type="submit" name="commentButton" value='<fmt:message key="label.preview.post" />'
-								class="btn btn-default btn-disable-on-submit voffset5" />
-						</div>
+						<input type="submit" name="commentButton" value='<fmt:message key="label.preview.post" />'
+							class="btn btn-default btn-disable-on-submit voffset5" />
+					</div>
 
-					</c:if>
-				</form:form>
-			</c:if>
+				</c:if>
+			</form:form>
+		</c:if>
 
-			<!-- Uploaded Attachments -->
-			<c:if test="${item.filesAllowed}">
-				<hr class="msg-hr">				
-				<form:form action="uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
+		<!-- Uploaded Attachments -->
+		<c:if test="${item.filesAllowed}">
+			<hr class="msg-hr">				
+			<form:form action="uploadFile.do?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${item.uid}"
 					modelAttribute="taskListItemForm" method="post" enctype="multipart/form-data" onsubmit="return validateFiles();">
-					<c:choose>
-						<c:when test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
-							<lams:Alert id="fileRequired" close="true" type="info">
-								<fmt:message key="label.learning.info.upload.file.required" />
-							</lams:Alert>
-						</c:when>
-						<c:otherwise>
-					</c:otherwise>
-					</c:choose>
+				<c:if test="${(mode != 'teacher') && !itemDTO.attachmentRequirementsMet}">
+					<lams:Alert id="fileRequired" close="true" type="info">
+						<fmt:message key="label.learning.info.upload.file.required" />
+					</lams:Alert>
+				</c:if>
 
-					<h5>
-						<fmt:message key="label.preview.upload.file" />
-					</h5>
-					<%@ include file="filelist.jsp"%>
-					<c:if test="${sessionMap.mode != 'teacher'}">
-						<lams:FileUpload fileFieldId="uploadButton"  fileFieldname="uploadedFile" fileInputMessageKey="label.authoring.choosefile.button"
-							maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-						<input type="submit" name="uploadedFileButton" value='<fmt:message key="label.preview.upload.button" />'
-							class="btn btn-default btn-disable-on-submit voffset5" />
-					</c:if>
-				</form:form>
+				<h5>
+					<fmt:message key="label.preview.upload.file" />
+				</h5>
+				<%@ include file="filelist.jsp"%>
+				<c:if test="${sessionMap.mode != 'teacher'}">
+					<lams:FileUpload fileFieldId="uploadButton"  fileFieldname="uploadedFile" fileInputMessageKey="label.authoring.choosefile.button"
+						maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
+					<input type="submit" name="uploadedFileButton" value='<fmt:message key="label.preview.upload.button" />'
+						class="btn btn-default btn-disable-on-submit voffset5" />
+				</c:if>
+			</form:form>
 				
-				<lams:WaitingSpinner id="attachmentArea_Busy"/>
-			</c:if>
+			<lams:WaitingSpinner id="attachmentArea_Busy"/>
 		</c:if>
 
 	</div>
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r3b9eccb4b8def4d56a62641a0fe4038a60b3afe6
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 3b9eccb4b8def4d56a62641a0fe4038a60b3afe6)
@@ -104,20 +104,14 @@
 		<div><em><fmt:message key="label.monitoring.tasksummary.task.required.to.finish" /></em></div>
 		</c:if>				
 
-		<c:if test="${item.childTask || item.commentsFilesAllowed || item.commentsAllowed || item.filesAllowed}">
+		<c:if test="${item.childTask || item.commentsAllowed || item.filesAllowed}">
 			<ul class="list-unstyled">
 				<c:if test="${item.childTask}">
 					<li>
 						(<fmt:message key="label.monitoring.tasksummary.parent.activity" />: ${item.parentTaskName})
 					</li>
-					</c:if>
-<!-- 						
-				<c:if test="${item.commentsFilesAllowed}">
-					<li>
-						<fmt:message key="label.monitoring.tasksummary.comments.files.enabled" />
-					</li>
 				</c:if>
--->					
+
 				<c:if test="${item.commentsAllowed}">
 					<li>
 						<fmt:message key="label.monitoring.tasksummary.comments.allowed" />