diff --git a/build.gradle b/build.gradle
index ad9d3f67..24e8df7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,11 +20,10 @@ dependencies {
     implementation 'com.github.haifengl:smile-core:2.6.0'
     
     /* no remote repo */
-    implementation files('lib/EventWebService.jar')
     api files('lib/flanagan.jar') // FFT and PSD library along with other tools
 
     implementation project(path: ':opensha')
     implementation project(path: ':opensha', configuration: 'implResolvable')
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/lib/EventWebService.jar b/lib/EventWebService.jar
deleted file mode 100644
index 58cc2e69..00000000
Binary files a/lib/EventWebService.jar and /dev/null differ
diff --git a/src/main/java/scratch/kevin/cfm/excelParse/CFM5ExcelParser.java b/src/main/java/scratch/kevin/cfm/excelParse/CFM5ExcelParser.java
index cf12847e..3b2938d1 100644
--- a/src/main/java/scratch/kevin/cfm/excelParse/CFM5ExcelParser.java
+++ b/src/main/java/scratch/kevin/cfm/excelParse/CFM5ExcelParser.java
@@ -140,37 +140,37 @@ private static int getGroupID(HSSFRow row, int groupStartCol) {
 		return -1;
 //		HSSFCell cell = row.getCell(groupStartCol);
 //		Preconditions.checkNotNull(cell);
-//		if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
+//		if (cell.getCellType() == org.apache.poi.ss.usermodel.CellType.NUMERIC)
 //			return (int)cell.getNumericCellValue();
 //		else
 //			return Integer.parseInt(cell.getStringCellValue());
 		
 		
-//		Preconditions.checkState(cell != null && cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC);
+//		Preconditions.checkState(cell != null && cell.getCellType() == org.apache.poi.ss.usermodel.CellType.NUMERIC);
 //		return (int)cell.getNumericCellValue();
 	}
 	
 	private static String getGroupName(HSSFRow row, int groupStartCol) {
 		HSSFCell cell = row.getCell(groupStartCol+1);
-		if (cell == null || cell.getCellType() == HSSFCell.CELL_TYPE_BLANK)
+		if (cell == null || cell.getCellType() == org.apache.poi.ss.usermodel.CellType.BLANK)
 			return "";  // blank ok for name
-		Preconditions.checkState(cell.getCellType() == HSSFCell.CELL_TYPE_STRING);
+		Preconditions.checkState(cell.getCellType() == org.apache.poi.ss.usermodel.CellType.STRING);
 		return cell.getStringCellValue();
 	}
 	
 	private static String getGroupShortName(HSSFRow row, int groupStartCol) {
 		HSSFCell cell = row.getCell(groupStartCol+2);
-		if (cell == null || cell.getCellType() == HSSFCell.CELL_TYPE_BLANK)
+		if (cell == null || cell.getCellType() == org.apache.poi.ss.usermodel.CellType.BLANK)
 			return getGroupName(row, groupStartCol).replaceAll(" ", "");
 		Preconditions.checkNotNull(cell);
-		if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) {
+		if (cell.getCellType() == org.apache.poi.ss.usermodel.CellType.NUMERIC) {
 			double val = cell.getNumericCellValue();
 			if (val == Math.round(val))
 				return (int)val+"";
 			else
 				return val+"";
 		}
-		Preconditions.checkState(cell.getCellType() == HSSFCell.CELL_TYPE_STRING);
+		Preconditions.checkState(cell.getCellType() == org.apache.poi.ss.usermodel.CellType.STRING);
 		if (cell.getStringCellValue().isEmpty())
 			return getGroupName(row, groupStartCol).replaceAll(" ", "");
 		return cell.getStringCellValue();
diff --git a/src/main/java/scratch/kevin/nshm23/figures/ThreeFaultSegAdjPlot.java b/src/main/java/scratch/kevin/nshm23/figures/ThreeFaultSegAdjPlot.java
index cc8eb7fe..32c21e58 100644
--- a/src/main/java/scratch/kevin/nshm23/figures/ThreeFaultSegAdjPlot.java
+++ b/src/main/java/scratch/kevin/nshm23/figures/ThreeFaultSegAdjPlot.java
@@ -9,7 +9,6 @@
 import java.util.List;
 
 import org.apache.commons.math3.stat.StatUtils;
-import org.apache.poi.hssf.util.HSSFColor.BLACK;
 import org.jfree.chart.annotations.XYTextAnnotation;
 import org.jfree.chart.ui.TextAnchor;
 import org.jfree.data.Range;
diff --git a/src/main/java/scratch/kevin/ucerf3/etas/PowellMeetingWebOrganizer.java b/src/main/java/scratch/kevin/ucerf3/etas/PowellMeetingWebOrganizer.java
index 22a6cc18..5416afa1 100644
--- a/src/main/java/scratch/kevin/ucerf3/etas/PowellMeetingWebOrganizer.java
+++ b/src/main/java/scratch/kevin/ucerf3/etas/PowellMeetingWebOrganizer.java
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.opensha.commons.util.FileNameComparator;
 
 import com.google.common.base.Joiner;
diff --git a/src/main/java/scratch/ned/SSAF_Inversion/SoSAF_SubSectionInversion.java b/src/main/java/scratch/ned/SSAF_Inversion/SoSAF_SubSectionInversion.java
index d962cd9d..78d0ea36 100644
--- a/src/main/java/scratch/ned/SSAF_Inversion/SoSAF_SubSectionInversion.java
+++ b/src/main/java/scratch/ned/SSAF_Inversion/SoSAF_SubSectionInversion.java
@@ -1437,7 +1437,7 @@ private void getPaleoSegRateConstraints() {
 				HSSFRow row = sheet.getRow(r);
 				if(row==null) continue;
 				HSSFCell cell = row.getCell( (short) 1);
-				if(cell==null || cell.getCellType()==HSSFCell.CELL_TYPE_STRING) continue;
+				if(cell==null || cell.getCellType()==org.apache.poi.ss.usermodel.CellType.STRING) continue;
 				lat = cell.getNumericCellValue();
 				siteName = row.getCell( (short) 0).getStringCellValue().trim();
 				lon = row.getCell( (short) 2).getNumericCellValue();
diff --git a/src/main/java/scratch/pagem/BayArea_Inversion/BayArea_Inversion.java b/src/main/java/scratch/pagem/BayArea_Inversion/BayArea_Inversion.java
index 657aa71d..5438c606 100644
--- a/src/main/java/scratch/pagem/BayArea_Inversion/BayArea_Inversion.java
+++ b/src/main/java/scratch/pagem/BayArea_Inversion/BayArea_Inversion.java
@@ -1546,7 +1546,7 @@ private void getPaleoSegRateConstraints() {
 					continue;
 				HSSFCell cell = row.getCell((short) 1);
 				if (cell == null
-						|| cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+						|| cell.getCellType() == org.apache.poi.ss.usermodel.CellType.STRING)
 					continue;
 				lat = cell.getNumericCellValue();
 				siteName = row.getCell((short) 0).getStringCellValue().trim();
diff --git a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_orig.java b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_orig.java
index f88080d2..89687705 100644
--- a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_orig.java
+++ b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_orig.java
@@ -1273,7 +1273,7 @@ private void getPaleoSegRateConstraints() {
 				HSSFRow row = sheet.getRow(r);
 				if(row==null) continue;
 				HSSFCell cell = row.getCell( (short) 1);
-				if(cell==null || cell.getCellType()==HSSFCell.CELL_TYPE_STRING) continue;
+				if(cell==null || cell.getCellType()==org.apache.poi.ss.usermodel.CellType.STRING) continue;
 				lat = cell.getNumericCellValue();
 				siteName = row.getCell( (short) 0).getStringCellValue().trim();
 				lon = row.getCell( (short) 2).getNumericCellValue();
diff --git a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_small.java b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_small.java
index dae503d8..7220c96d 100644
--- a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_small.java
+++ b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_small.java
@@ -1555,7 +1555,7 @@ private void getPaleoSegRateConstraints() {
 					continue;
 				HSSFCell cell = row.getCell((short) 1);
 				if (cell == null
-						|| cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+						|| cell.getCellType() == org.apache.poi.ss.usermodel.CellType.STRING)
 					continue;
 				lat = cell.getNumericCellValue();
 				siteName = row.getCell((short) 0).getStringCellValue().trim();
diff --git a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_v3.java b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_v3.java
index 36eedca5..24b0e7bf 100644
--- a/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_v3.java
+++ b/src/main/java/scratch/pagem/SSAF_Inversion_pagem/SoSAF_SubSectionInversion_v3.java
@@ -1546,7 +1546,7 @@ private void getPaleoSegRateConstraints() {
 					continue;
 				HSSFCell cell = row.getCell((short) 1);
 				if (cell == null
-						|| cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
+						|| cell.getCellType() == org.apache.poi.ss.usermodel.CellType.STRING)
 					continue;
 				lat = cell.getNumericCellValue();
 				siteName = row.getCell((short) 0).getStringCellValue().trim();