diff --git a/LSL2/STPROC/METROLOGY_SERVICES.txt b/LSL2/STPROC/METROLOGY_SERVICES.txt
index ec5c679..27e5e7f 100644
--- a/LSL2/STPROC/METROLOGY_SERVICES.txt
+++ b/LSL2/STPROC/METROLOGY_SERVICES.txt
@@ -414,36 +414,27 @@ Service ImportMetrologyFiles(Machine=MACHINE_TYPES)
 
 			Begin Case
 				Case Machine _EQC 'Tencor'
-					SearchPattern = '*.pdsf';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08DDUPSFS6420\Source\MET08DDUPSFS6420\'
 				Case Machine _EQC 'HgCV'
-					SearchPattern = '*.pdsf';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08RESIHGCV\Source\MET08RESIHGCV\'
 				Case Machine _EQC 'CDE'
-					SearchPattern = '*.pdsf';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08RESIMAPCDE\Source\MET08RESIMAPCDE\'
 				Case Machine _EQC 'Biorad'
-					SearchPattern = '*.pdsf';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08THFTIRQS408M\Source\MET08THFTIRQS408M\'
 				Case Machine _EQC 'Stratus'
-					SearchPattern = '*.txt';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08THFTIRSTRATUS\Source\MET08THFTIRSTRATUS\'
 				Case Machine _EQC 'SP1'
-					SearchPattern = '*.pdsf';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08DDUPSP1TBI\Source\MET08DDUPSP1TBI\'
 				Case Machine _EQC 'SPV'
-					SearchPattern = '*.txt';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08RESISRP2100\Source\MET08RESISRP2100\'
 				Case Machine _EQC 'SRP'
-					SearchPattern = '*.txt';
 					DataPath = Environment_Services('GetApplicationRootPath') : '\Metrology\MET08ANLYSDIFAAST230\Source\MET08ANLYSDIFAAST230\'
 				Case Otherwise$
-					SearchPattern = '*.txt';
 					Error_Services('Add', 'Error in ':Service:' service. Unsupported Machine "':Machine:'" passed into service')
 			End Case
 
 			If Error_Services('NoError') then
-
+				SearchPattern = '*.pdsf';
 				InitDir DataPath:SearchPattern
 				FileList = DirList()
 				FileNames = ''
@@ -520,41 +511,15 @@ Service ImportMetrologyFiles(Machine=MACHINE_TYPES)
 								RepoPath = Environment_Services('GetApplicationRootPath') : '\Metrology\Run Data Repository\MET08ANLYSDIFAAST230\Source\MET08ANLYSDIFAAST230\'                                    
 						End Case
 
-						IF SearchPattern = '*.pdsf' THEN
-							OSREAD Text FROM DataPath:FileName THEN
-								json = Metrology_Services('GetJsonFromProcessDataStandardFormat', Text);
-							END ELSE
-								json = '';
-							END
-							IF LEN(json) GT 0 THEN
-								RunData = Metrology_Services('GetRunData', Machine, json);
-							END ELSE
-								Metrology_Services('LogResults', PSN, Machine, 'UID002', Service : ' : ' : 'Failed to get PDSF json');
-							END
+						OSREAD Text FROM DataPath:FileName THEN
+							json = Metrology_Services('GetJsonFromProcessDataStandardFormat', Text);
 						END ELSE
-
-							OSREAD RunData FROM DataPath:FileName THEN
-								Set_Status(0)
-								OSWrite RunData to RepoPath:FileName
-								status_code = ''
-								If Get_Status(status_code) then
-									ErrorMessage = 'Error writing run data file to repository: status_code = ' : status_code
-									Metrology_Services('LogResults', '', Machine, 'UID001', Service : ' : ' : ErrorMessage)
-									Set_Status(0)
-								end
-
-								SWAP '|' WITH @VM IN RunData
-								SWAP CRLF$ WITH @FM IN RunData
-
-								LOOP
-									LastChar = RunData[-1,1]
-								UNTIL LastChar NE @FM
-									RunData[-1,1] = ''
-								REPEAT
-								Convert Tab$ to @FM in RunData
-							END else
-								Metrology_Services('LogResults', '', Machine, 'UID001', 'Read : ' : FileName : ', Size : ' : FileSize)
-							end
+							json = '';
+						END
+						IF LEN(json) GT 0 THEN
+							RunData = Metrology_Services('GetRunData', Machine, json);
+						END ELSE
+							Metrology_Services('LogResults', PSN, Machine, 'UID002', Service : ' : ' : 'Failed to get PDSF json');
 						END
 
 						*************************