diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
index 8a8ce70427745504ccdddaef9012a82a62d56b1a..8da139a7f5c5784b473b723c1009411aae016501 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
@@ -1,6 +1,7 @@
 package gov.usgs.earthquake.nshmp.www;
 
 import java.nio.file.Path;
+import java.util.logging.Logger;
 
 import org.crac.Context;
 import org.crac.Resource;
@@ -27,13 +28,15 @@ public class PrimingResource implements OrderedResource {
 
   @Override
   public void beforeCheckpoint(Context<? extends Resource> context) throws Exception {
+    Logger.getAnonymousLogger().info("Before checkpoint");
     ServletUtil.model(ServletUtil.loadModel(modelPath));
     updateParameter();
   }
 
   @Override
   public void afterRestore(Context<? extends Resource> context) throws Exception {
-    System.out.println("Reset exexutors");
+    Logger.getAnonymousLogger().info("After restore: reset execurors");
+    // Reset executors on restore as Shutdown event does not fire on AWS lambda
     ServletUtil.resetExecutors();
   }
 
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
index e007dea5f89e5b94ac4bd747b5162a07a5f77d30..5f75c7c280d85548f3a875cd6d89ceb6be164c48 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
@@ -91,6 +91,9 @@ public class ServletUtil {
         .create();
   }
 
+  /**
+   * Reset executors on AWS Lambda SnapStart restore
+   */
   static void resetExecutors() {
     CALC_EXECUTOR.shutdown();
     TASK_EXECUTOR.shutdown();
@@ -115,7 +118,6 @@ public class ServletUtil {
 
   @EventListener
   void startup(StartupEvent event) {
-    System.out.println("on start up");
     if (!awsRuntime.isPresent()) {
       HAZARD_MODEL = loadModel(modelPath);
     }