diff --git a/src/component/base/DraftEditor.react.js b/src/component/base/DraftEditor.react.js
index 3630755..430ae31 100644
--- a/src/component/base/DraftEditor.react.js
+++ b/src/component/base/DraftEditor.react.js
@@ -26,7 +26,6 @@ const DraftEditorContents = require('DraftEditorContents.react');
 const DraftEditorDragHandler = require('DraftEditorDragHandler');
 const DraftEditorEditHandler = require('DraftEditorEditHandler');
 const DraftEditorPlaceholder = require('DraftEditorPlaceholder.react');
-const DraftFeatureFlags = require('DraftFeatureFlags');
 const EditorState = require('EditorState');
 const React = require('React');
 const ReactDOM = require('ReactDOM');
@@ -268,8 +267,6 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
               // here which makes its autotranslation skip over this subtree.
               'notranslate': !readOnly,
               'public/DraftEditor/content': true,
-              'public/DraftEditor/highlightInvalidText':
-                DraftFeatureFlags.draft_highlight_invalid_text,
             })}
             contentEditable={!readOnly}
             data-testid={this.props.webDriverTestID}
diff --git a/src/component/contents/DraftEditorLeaf.react.js b/src/component/contents/DraftEditorLeaf.react.js
index 00d2ea3..e1a7308 100644
--- a/src/component/contents/DraftEditorLeaf.react.js
+++ b/src/component/contents/DraftEditorLeaf.react.js
@@ -21,7 +21,6 @@ const DraftEditorTextNode = require('DraftEditorTextNode.react');
 var React = require('React');
 var ReactDOM = require('ReactDOM');
 
-const cx = require('cx');
 const invariant = require('invariant');
 var setDraftEditorSelection = require('setDraftEditorSelection');
 
@@ -167,7 +166,6 @@ class DraftEditorLeaf extends React.Component<Props> {
     return (
       <span
         data-offset-key={offsetKey}
-        className={cx('public/DraftEditor/leaf')}
         ref="leaf"
         style={styleObj}>
         <DraftEditorTextNode>{text}</DraftEditorTextNode>
diff --git a/src/component/contents/DraftEditorTextNode.react.js b/src/component/contents/DraftEditorTextNode.react.js
index 961d806..8c273cb 100644
--- a/src/component/contents/DraftEditorTextNode.react.js
+++ b/src/component/contents/DraftEditorTextNode.react.js
@@ -17,7 +17,6 @@ const React = require('React');
 const ReactDOM = require('ReactDOM');
 const UserAgent = require('UserAgent');
 
-const cx = require('cx');
 const invariant = require('invariant');
 
 // In IE, spans with <br> tags render as two newlines. By rendering a span
@@ -90,10 +89,7 @@ class DraftEditorTextNode extends React.Component<Props> {
       return this._forceFlag ? NEWLINE_A : NEWLINE_B;
     }
     return (
-      <span
-        key={this._forceFlag ? 'A' : 'B'}
-        className={cx('public/DraftEditor/textNode')}
-        data-text="true">
+      <span key={this._forceFlag ? 'A' : 'B'} data-text="true">
         {this.props.children}
       </span>
     );
diff --git a/src/component/utils/DraftFeatureFlags-core.js b/src/component/utils/DraftFeatureFlags-core.js
index b0dc50e..183284f 100644
--- a/src/component/utils/DraftFeatureFlags-core.js
+++ b/src/component/utils/DraftFeatureFlags-core.js
@@ -13,7 +13,6 @@
 'use strict';
 
 var DraftFeatureFlags = {
-  draft_highlight_invalid_text: false,
   draft_killswitch_allow_nontextnodes: false,
   draft_segmented_entities_behavior: false,
 };