diff --git a/app/app.js b/app/app.js
index 3876df3d2..dc8188ede 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,7 +3,7 @@ import {
   BpmnPropertiesPanelModule,
   BpmnPropertiesProviderModule,
 } from 'bpmn-js-properties-panel';
-import diagramXML from '../test/spec/bpmn/diagram.bpmn';
+import diagramXML from '../test/spec/bpmn/basic_message.bpmn';
 import spiffworkflow from './spiffworkflow';
 import setupFileOperations from './fileOperations';
 
diff --git a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js
index cb7cfbcb5..b158ab324 100644
--- a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js
+++ b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js
@@ -142,16 +142,6 @@ function MessageCorrelationPropertyGroup(props) {
       moddle,
       commandStack,
     },
-    {
-      id: `${idPrefix}-correlation-property-id`,
-      component: CorrelationPropertyIdTextField,
-      isEdited: isTextFieldEntryEdited,
-      idPrefix,
-      element,
-      correlationPropertyModdleElement,
-      translate,
-      commandStack,
-    },
     {
       id: `${idPrefix}-correlation-property-name`,
       component: CorrelationPropertyNameTextField,
diff --git a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js
index 2f5b4c259..3e1a87c17 100644
--- a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js
+++ b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js
@@ -96,13 +96,6 @@ function removeFactory(props) {
 function messageGroup(props) {
   const { messageElement, commandStack, translate, idPrefix } = props;
   return [
-    {
-      id: `${idPrefix}-id`,
-      component: MessageIdTextField,
-      messageElement,
-      commandStack,
-      translate,
-    },
     {
       id: `${idPrefix}-name`,
       component: MessageNameTextField,