diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt
index bbb7644..fb9831b 100644
--- a/LSL2/STPROC/SCAN_SERVICES.txt
+++ b/LSL2/STPROC/SCAN_SERVICES.txt
@@ -987,22 +987,12 @@ Service ProcessScanData(ScanID, ScanJSON)
 																ScanMsg = 'The LWI stage engineering instructions must be acknowledged before the load operation can be signed.'
 																Scan_Services('AddNotAcceptableReason', ScanMsg)
 															end                                                
-														Case CurrStage _EQC 'LWIS'
-															Action = 'LWIS'
-															Error_Services('Add', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application. The OpenInsight user interface must be used in order to proceed.')
-														Case CurrStage _EQC 'LWII'
-															Action = 'LWII'
-															Error_Services('Add', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application. The OpenInsight user interface must be used in order to proceed.')
-														Case CurrStage _EQC 'QA'
-															Action = 'QA'
-															Error_Services('Add', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application. The OpenInsight user interface must be used in order to proceed.')
-													    Case CurrStage _EQC 'PREC'
-															Action = 'PREC'
-															Error_Services('Add', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application. The OpenInsight user interface must be used in order to proceed.')
 														Case CurrStage _EQC 'COMP'
 															Action = 'COMP'
 															Error_Services('Add', '(':CassetteID:") Cassette has already been FQA'd.")
 														Case Otherwise$
+														    Action = CurrStage
+									                        Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
 													End Case
 												end else
 													Scan_Services('AddNotAcceptableReason', 'EmployeeID required to complete a tool scan.')                      
@@ -1283,22 +1273,12 @@ Service AcceptScan(ScanID, ScanJSON)
 									LogData<6> = Action
 									LogData<7> = Result
 									Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
-								Case CurrStage _EQC 'LWIS'
-									Action = 'LWIS'
-									Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
-								Case CurrStage _EQC 'LWII'
-									Action = 'LWII'
-									Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
-								Case CurrStage _EQC 'QA'
-									Action = 'QA'
-									Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
-								Case CurrStage _EQC 'PREC'
-									Action = 'PREC'
-									Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
 								Case CurrStage _EQC 'COMP'
 									Action = 'COMP'
 									Error_Services('Set', '(':CassetteID:") Cassette has already been FQA'd.")
 								Case Otherwise$
+								    Action = CurrStage
+									Error_Services('Set', '(':CassetteID:') The ':CurrStage:' is not currently supported by the barcode application.')
 							End Case            
 					End Case
 				end