diff --git a/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss b/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss
deleted file mode 100644
index d9f97277..00000000
--- a/src/components/ChallengeEditor/MaximumSubmissions-Field/MaximumSubmissions-Field.module.scss
+++ /dev/null
@@ -1,131 +0,0 @@
-@use '../../../styles/includes' as *;
-
-.row {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: row;
-  margin: 30px 30px 0 30px;
-  align-content: space-between;
-  justify-content: flex-start;
-
-  .subGroup {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 15px;
-
-    .subRow {
-      display: flex;
-      align-items: center;
-      margin-bottom: 18px;
-
-      input {
-        width: 100px;
-      }
-
-      .tcCheckbox {
-        @include tc-checkbox;
-
-        .tc-checkbox-label {
-          @include roboto-light();
-
-          line-height: 17px;
-          font-weight: 300;
-          margin-left: 21px;
-          user-select: none;
-          cursor: pointer;
-          width: 195px;
-          font-size: 14px;
-          color: #3d3d3d;
-        }
-
-        height: 18px;
-        width: 210px;
-        margin: 0;
-        padding: 0;
-        vertical-align: bottom;
-        position: relative;
-        display: inline-block;
-
-        input[type=checkbox] {
-          display: flex;
-          opacity: 0;
-
-          &:focus ~ label {
-            &::after {
-              opacity: 0.3;
-            }
-          }
-
-          &:checked ~ label {
-            background: $tc-blue-20;
-
-            &::after {
-              opacity: 1;
-              border-color: $white;
-            }
-          }
-        }
-
-        label {
-          @include roboto-light();
-
-          line-height: 17px;
-          font-weight: 300;
-          cursor: pointer;
-          position: absolute;
-          display: inline-block;
-          width: 14px;
-          height: 14px;
-          top: 0;
-          left: 0;
-          border: none;
-          box-shadow: none;
-          background: $tc-gray-30;
-          transition: all 0.15s ease-in-out;
-
-          &::after {
-            opacity: 0;
-            content: '';
-            position: absolute;
-            width: 9px;
-            height: 5px;
-            background: transparent;
-            top: 2px;
-            left: 2px;
-            border-top: none;
-            border-right: none;
-            transform: rotate(-45deg);
-            transition: all 0.15s ease-in-out;
-          }
-
-          &:hover::after {
-            opacity: 0.3;
-          }
-
-          div {
-            margin-left: 24px;
-            width: 75px;
-          }
-        }
-      }
-
-      .tcCheckbox:last-of-type {
-        width: 100px;
-      }
-    }
-
-    .subRow:last-of-type {
-      margin-bottom: 0;
-    }
-  }
-  .subGroup:last-of-type {
-    margin-bottom: 0;
-  }
-
-
-}
-
-.row:last-of-type {
-  flex-direction: column;
-}
diff --git a/src/components/ChallengeEditor/MaximumSubmissions-Field/index.js b/src/components/ChallengeEditor/MaximumSubmissions-Field/index.js
deleted file mode 100644
index 03d0fc88..00000000
--- a/src/components/ChallengeEditor/MaximumSubmissions-Field/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import cn from 'classnames'
-import _ from 'lodash'
-
-import styles from './MaximumSubmissions-Field.module.scss'
-
-class MaximumSubmissionsField extends Component {
-  render () {
-    const { challenge, onUpdateMetadata, readOnly } = this.props
-    const metadata = challenge.metadata || {}
-    let existingData = _.find(metadata, { name: 'submissionLimit' })
-    let isUnlimited = false
-    let isLimited = false
-    let count = ''
-    if (existingData) {
-      const value = JSON.parse(existingData.value)
-      if (value.unlimited === 'true') {
-        isUnlimited = true
-      }
-      if (value.limit === 'true') {
-        isLimited = true
-      }
-      if (value.count) {
-        count = value.count
-      }
-    }
-    return (
-      <React.Fragment>
-        <div className={styles.row}>
-          <div className={cn(styles.field, styles.col1)}>
-            <label htmlFor='maximum'>Maximum Number of Submissions :</label>
-            {readOnly && (<span> {isUnlimited ? 'Unlimited' : count}</span>)}
-          </div>
-        </div>
-        {!readOnly && (<div className={styles.row}>
-          <div className={styles.subGroup}>
-            <div className={styles.subRow}>
-              <div className={styles.tcCheckbox}>
-                <input
-                  name='unlimited'
-                  id='unlimited'
-                  type='checkbox'
-                  checked={isUnlimited}
-                  onChange={(e) => onUpdateMetadata('submissionLimit', e.target.checked, 'unlimited')}
-                />
-                <label htmlFor='unlimited'>
-                  <div className={styles.checkboxLabel}>
-                    Unlimited
-                  </div>
-                </label>
-              </div>
-            </div>
-          </div>
-          <div className={styles.subGroup}>
-            <div className={styles.subRow}>
-              <div className={styles.tcCheckbox}>
-                <input
-                  name='limit'
-                  id='limit'
-                  type='checkbox'
-                  checked={isLimited}
-                  onChange={(e) => onUpdateMetadata('submissionLimit', e.target.checked, 'limit')}
-                />
-                <label htmlFor='limit'>
-                  <div className={styles.checkboxLabel}>
-                    Limit :
-                  </div>
-                </label>
-              </div>
-              <input
-                id='count'
-                name='count'
-                type='text'
-                placeholder=''
-                value={count}
-                maxLength='200'
-                onChange={(e) => onUpdateMetadata('submissionLimit', e.target.value.replace(/[^\d]+/g, ''), 'count')}
-              />
-            </div>
-          </div>
-        </div>)}
-      </React.Fragment>
-    )
-  }
-}
-
-MaximumSubmissionsField.defaultProps = {
-  onUpdateMetadata: () => {},
-  readOnly: false
-}
-
-MaximumSubmissionsField.propTypes = {
-  challenge: PropTypes.shape().isRequired,
-  onUpdateMetadata: PropTypes.func,
-  readOnly: PropTypes.bool
-}
-
-export default MaximumSubmissionsField
diff --git a/src/components/ChallengeEditor/TextEditor-Field/index.js b/src/components/ChallengeEditor/TextEditor-Field/index.js
index 2ffc2bcc..501f04be 100644
--- a/src/components/ChallengeEditor/TextEditor-Field/index.js
+++ b/src/components/ChallengeEditor/TextEditor-Field/index.js
@@ -5,7 +5,6 @@ import SkillsField from '../SkillsField'
 import FinalDeliverablesField from '../FinalDeliverables-Field'
 import StockArtsField from '../StockArts-Field'
 import SubmssionVisibility from '../SubmissionVisibility-Field'
-import MaximumSubmissionsField from '../MaximumSubmissions-Field'
 import { CHALLENGE_TRACKS } from '../../../config/constants'
 import styles from './TextEditor-Field.module.scss'
 import PropTypes from 'prop-types'
@@ -123,11 +122,6 @@ class TextEditorField extends Component {
               onUpdateCheckbox={onUpdateMetadata}
               readOnly={readOnly}
             />
-            <MaximumSubmissionsField
-              challenge={challenge}
-              onUpdateMetadata={onUpdateMetadata}
-              readOnly={readOnly}
-            />
           </React.Fragment>
         )}
       </div>
diff --git a/src/components/ChallengeEditor/TextEditor-Field/index.test.js b/src/components/ChallengeEditor/TextEditor-Field/index.test.js
new file mode 100644
index 00000000..9e212f01
--- /dev/null
+++ b/src/components/ChallengeEditor/TextEditor-Field/index.test.js
@@ -0,0 +1,75 @@
+/* global describe, it, expect, beforeEach, afterEach, jest */
+
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { act } from 'react-dom/test-utils'
+import TextEditorField from './index'
+import { CHALLENGE_TRACKS } from '../../../config/constants'
+
+jest.mock('../SpecialChallengeField', () => () => null)
+jest.mock('../TagsField', () => () => null)
+jest.mock('../SkillsField', () => () => null)
+jest.mock('../FinalDeliverables-Field', () => () => null)
+jest.mock('../StockArts-Field', () => () => null)
+jest.mock('../SubmissionVisibility-Field', () => () => null)
+jest.mock('../Description-Field', () => () => null)
+jest.mock('../ChallengeReviewer-Field', () => () => null)
+jest.mock('../../Buttons', () => ({
+  PrimaryButton: () => null
+}))
+
+describe('TextEditorField', () => {
+  let container
+
+  const renderComponent = (props = {}) => {
+    act(() => {
+      ReactDOM.render(
+        <TextEditorField
+          challenge={{ trackId: CHALLENGE_TRACKS.DESIGN, metadata: [] }}
+          shouldShowPrivateDescription={false}
+          {...props}
+        />,
+        container
+      )
+    })
+  }
+
+  beforeEach(() => {
+    container = document.createElement('div')
+    document.body.appendChild(container)
+  })
+
+  afterEach(() => {
+    ReactDOM.unmountComponentAtNode(container)
+    container.remove()
+    container = null
+    jest.clearAllMocks()
+  })
+
+  it('does not render submission limit controls for design challenges while editing', () => {
+    renderComponent()
+
+    expect(container.textContent).not.toContain('Maximum Number of Submissions')
+    expect(container.textContent).not.toContain('Unlimited')
+    expect(container.querySelector('#limit')).toBeNull()
+    expect(container.querySelector('#count')).toBeNull()
+  })
+
+  it('does not render a submission limit summary for design challenges in read-only mode', () => {
+    renderComponent({
+      readOnly: true,
+      challenge: {
+        trackId: CHALLENGE_TRACKS.DESIGN,
+        metadata: [
+          {
+            name: 'submissionLimit',
+            value: '{"unlimited":"true","limit":"false","count":""}'
+          }
+        ]
+      }
+    })
+
+    expect(container.textContent).not.toContain('Maximum Number of Submissions')
+    expect(container.textContent).not.toContain('Unlimited')
+  })
+})
diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js
index 3d21e062..1df79071 100644
--- a/src/components/ChallengeEditor/index.js
+++ b/src/components/ChallengeEditor/index.js
@@ -622,27 +622,8 @@ class ChallengeEditor extends Component {
     if (!existingMetadata) {
       existingMetadata = { name }
       newChallenge.metadata.push(existingMetadata)
-      if (name === 'submissionLimit') {
-        existingMetadata.value = '{}'
-      }
     }
-    if (existingMetadata.name === 'submissionLimit') {
-      const submissionLimit = JSON.parse(existingMetadata.value)
-      _.forOwn(submissionLimit, (value, key) => {
-        if (value === 'true') {
-          submissionLimit[key] = 'false'
-        }
-      })
-      submissionLimit[path] = `${value}`
-      if (path === 'count') {
-        submissionLimit.limit = 'true'
-        submissionLimit.unlimited = 'false'
-      } else if (path === 'unlimited' && value) {
-        submissionLimit.limit = 'false'
-        submissionLimit.count = ''
-      }
-      existingMetadata.value = JSON.stringify(submissionLimit)
-    } else if (existingMetadata.name === 'show_data_dashboard') {
+    if (existingMetadata.name === 'show_data_dashboard') {
       existingMetadata.value = Boolean(value)
     } else {
       existingMetadata.value = `${value}`