diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.js b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
index 8062334fe..455eb4156 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.js
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
@@ -59,7 +59,7 @@ Template.toolbarSection.helpers({
         //         bottomLabel: 'Hanging'
         //     }]
         // };
-        
+
         return {
             toggleable: true,
             key: 'rightSidebar',
@@ -268,15 +268,6 @@ Template.toolbarSection.helpers({
             svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-sr'
         });
 
-        buttonData.push({
-            id: 'ps',
-            title: 'PS',
-            iconClasses: 'fa fa-th-large',
-            classes: 'imageViewerTool',
-            svgLink: '/packages/ohif_viewerbase/assets/icons.svg#icon-ps'
-        });
-        
-
         buttonData.push({
             id: 'toggleMore',
             title: 'More',
@@ -334,4 +325,4 @@ Template.toolbarSection.onRendered(function() {
             }
         }
     }
-});
\ No newline at end of file
+});
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index e31c034a0..ed9abe3e1 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -226,11 +226,6 @@ Meteor.startup(function() {
             action: viewportUtils.toggleDownloadDialog,
             disabled: () => !viewportUtils.isDownloadEnabled()
         },
-        ps: {
-            name: 'Show/Hide Presentation State',
-            action: () => Session.set('MeasurementsReady', !Session.get('MeasurementsReady')),
-            disabled: () => false
-        },
         sr: {
             name: 'Show/Hide Structured Report',
             action: () => OHIF.ui.showDialog('structuredReportModal'),
diff --git a/config/publicOrthancDICOMWeb.json b/config/publicOrthancDICOMWeb.json
index c187fdad1..8b78e604e 100644
--- a/config/publicOrthancDICOMWeb.json
+++ b/config/publicOrthancDICOMWeb.json
@@ -1,26 +1,7 @@
 {
-  "servers": {
-    "dicomWeb": [
-      {
-        "name": "Orthanc",
-        "wadoUriRoot": "http://dicomweb.ohif.org/wado",
-        "qidoRoot": "http://dicomweb.ohif.org/dicom-web",
-        "wadoRoot": "http://dicomweb.ohif.org/dicom-web",
-        "qidoSupportsIncludeField": false,
-        "imageRendering": "wadouri",
-        "thumbnailRendering": "wadouri",
-        "requestOptions": {
-          "auth": "orthanc:orthanc",
-          "logRequests": true,
-          "logResponses": false,
-          "logTiming": true
-        }
-      }
-    ]
-  },
-  "defaultServiceType": "dicomWeb",
   "dropCollections": true,
   "public": {
+    "clientOnly": true,
     "verifyEmail": false,
     "ui": {
         "studyListFunctionsEnabled": true,
@@ -29,9 +10,25 @@
         "displaySetNavigationMultipleViewports": true,
         "autoPositionMeasurementsTextCallOuts": "TRLB",
         "studyListDateFilterNumDays": 1
+    },
+    "servers": {
+      "dicomWeb": [
+        {
+          "name": "Orthanc",
+          "wadoUriRoot": "https://server.dcmjs.org//dcm4chee-arc/aets/DCM4CHEE/wado",
+          "qidoRoot": "https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs",
+          "wadoRoot": "https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs",
+          "qidoSupportsIncludeField": true,
+          "imageRendering": "wadors",
+          "thumbnailRendering": "wadors",
+          "requestOptions": {
+            "requestFromBrowser": true,
+            "logRequests": true,
+            "logResponses": false,
+            "logTiming": true
+          }
+        }
+      ]
     }
-  },
-  "proxy": {
-    "enabled": true
   }
 }