Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -222,9 +222,7 @@
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 					
 			</form:form>
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -192,9 +192,7 @@
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 			</form:form>
 			
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -171,9 +171,7 @@
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 				
 			</form:form>
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -273,9 +273,7 @@
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}" />
 				</div><!-- settings tab ends -->
 			</form:form>
 			
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -224,9 +224,7 @@
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>			
 				
 			</form:form>
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -174,9 +174,7 @@
 							placeholder="${FEEDBACK_ON_INCORRECT_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>	
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 			</form:form>
 			
Index: lams_central/web/qb/authoring/addshortanswer.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -183,9 +183,7 @@
 							placeholder="${GENERAL_FEEDBACK_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}" />
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 
 			</form:form>
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -r1f7c5fb422d619e35598ae416565c790d5c76fff -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 1f7c5fb422d619e35598ae416565c790d5c76fff)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -183,9 +183,7 @@
 							placeholder="${FEEDBACK_ON_FALSE_LABEL}" contentFolderID="${assessmentQuestionForm.contentFolderID}"/>
 					</div>
 					
-					<c:if test="${not empty assessmentQuestionForm.questionId}">
-						<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
-					</c:if>
+					<lams:OutcomeAuthor qbQuestionId="${assessmentQuestionForm.questionId}"  />
 				</div>
 			</form:form>
 		</div>	
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
===================================================================
diff -u -r67db3e1b2ada0d59ff98c807a54282783797c5e6 -r2de398c14ca8553a69fcd41944127cc14fc7b66c
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql	(.../patch20190703.sql)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql	(.../patch20190703.sql)	(revision 2de398c14ca8553a69fcd41944127cc14fc7b66c)
@@ -4,9 +4,7 @@
 ----------------------Put all sql statements below here-------------------------
 
 -- LDEV-4834 Add Learning Outcomes to QB questions
-ALTER TABLE lams_outcome_mapping ADD COLUMN qb_question_id INT,
-								 ADD CONSTRAINT FK_lams_outcome_mapping_4 FOREIGN KEY (qb_question_id)
-								 	REFERENCES lams_qb_question (question_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE lams_outcome_mapping ADD COLUMN qb_question_id INT;
 								 	
 ----------------------Put all sql statements above here-------------------------