diff --git a/wax-questions-service/src/EssayService/components/EditorComponent.js b/wax-questions-service/src/EssayService/components/EditorComponent.js
deleted file mode 100644
index 02a97a20723c50bf6475affb760ff63bb388b53b..0000000000000000000000000000000000000000
--- a/wax-questions-service/src/EssayService/components/EditorComponent.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import React, { useContext, useRef, useEffect } from 'react';
-import styled from 'styled-components';
-import { EditorView } from 'prosemirror-view';
-import { EditorState, TextSelection } from 'prosemirror-state';
-import { StepMap } from 'prosemirror-transform';
-import { keymap } from 'prosemirror-keymap';
-import { baseKeymap } from 'prosemirror-commands';
-import { undo, redo } from 'prosemirror-history';
-import { WaxContext } from 'wax-prosemirror-core';
-import Placeholder from '../../MultipleChoiceQuestionService/plugins/placeholder';
-
-const EditorWrapper = styled.div`
-  border: none;
-  display: flex;
-  flex: 2 1 auto;
-  justify-content: left;
-
-  .ProseMirror {
-    white-space: break-spaces;
-    width: 100%;
-    word-wrap: break-word;
-
-    &:focus {
-      outline: none;
-    }
-
-    p.empty-node:first-child::before {
-      content: attr(data-content);
-    }
-
-    .empty-node::before {
-      color: rgb(170, 170, 170);
-      float: left;
-      font-style: italic;
-      height: 0px;
-      pointer-events: none;
-    }
-  }
-`;
-
-const EditorComponent = ({ node, view, getPos }) => {
-  const editorRef = useRef();
-
-  const context = useContext(WaxContext);
-  const {
-    app,
-    activeViewId,
-    pmViews: { main },
-  } = context;
-  let questionView;
-  const questionId = node.attrs.id;
-  const isEditable = main.props.editable(editable => {
-    return editable;
-  });
-
-  let finalPlugins = [];
-
-  const createKeyBindings = () => {
-    const keys = getKeys();
-    Object.keys(baseKeymap).forEach(key => {
-      keys[key] = baseKeymap[key];
-    });
-    return keys;
-  };
-
-  const getKeys = () => {
-    return {
-      'Mod-z': () => undo(view.state, view.dispatch),
-      'Mod-y': () => redo(view.state, view.dispatch),
-    };
-  };
-
-  const plugins = [keymap(createKeyBindings()), ...app.getPlugins()];
-
-  const createPlaceholder = placeholder => {
-    return Placeholder({
-      content: placeholder,
-    });
-  };
-
-  finalPlugins = finalPlugins.concat([
-    createPlaceholder('Type your essay'),
-    ...plugins,
-  ]);
-
-  useEffect(() => {
-    questionView = new EditorView(
-      {
-        mount: editorRef.current,
-      },
-      {
-        editable: () => isEditable,
-        state: EditorState.create({
-          doc: node,
-          plugins: finalPlugins,
-        }),
-
-        dispatchTransaction,
-        disallowedTools: ['Images', 'Lists', 'lift', 'MultipleChoice'],
-        handleDOMEvents: {
-          mousedown: () => {
-            context.pmViews[activeViewId].dispatch(
-              context.pmViews[activeViewId].state.tr.setSelection(
-                TextSelection.between(
-                  context.pmViews[activeViewId].state.selection.$anchor,
-                  context.pmViews[activeViewId].state.selection.$head,
-                ),
-              ),
-            );
-            context.updateView({}, questionId);
-            if (questionView.hasFocus()) questionView.focus();
-          },
-        },
-
-        attributes: {
-          spellcheck: 'false',
-        },
-      },
-    );
-
-    // Set Each note into Wax's Context
-    context.updateView(
-      {
-        [questionId]: questionView,
-      },
-      questionId,
-    );
-    questionView.focus();
-  }, []);
-
-  const dispatchTransaction = tr => {
-    const { state, transactions } = questionView.state.applyTransaction(tr);
-    questionView.updateState(state);
-    context.updateView({}, questionId);
-
-    if (!tr.getMeta('fromOutside')) {
-      const outerTr = view.state.tr;
-      const offsetMap = StepMap.offset(getPos() + 1);
-      for (let i = 0; i < transactions.length; i++) {
-        const { steps } = transactions[i];
-        for (let j = 0; j < steps.length; j++)
-          outerTr.step(steps[j].map(offsetMap));
-      }
-      if (outerTr.docChanged)
-        view.dispatch(outerTr.setMeta('outsideView', questionId));
-    }
-  };
-
-  return (
-    <EditorWrapper>
-      <div ref={editorRef} />
-    </EditorWrapper>
-  );
-};
-
-export default EditorComponent;
diff --git a/wax-questions-service/src/EssayService/components/EssayAnswerComponent.js b/wax-questions-service/src/EssayService/components/EssayAnswerComponent.js
index 3eb02cf089c9e58d913e5530d2571be52a31a955..7a52873d7722a9f182dfac1250477024aef3580d 100644
--- a/wax-questions-service/src/EssayService/components/EssayAnswerComponent.js
+++ b/wax-questions-service/src/EssayService/components/EssayAnswerComponent.js
@@ -191,7 +191,7 @@ const EssayAnswerComponent = ({ node, view, getPos }) => {
   };
 
   return (
-    <EditorWrapper testMode={testMode} showFeedBack={showFeedBack}>
+    <EditorWrapper showFeedBack={showFeedBack} testMode={testMode}>
       <div ref={editorRef} />
     </EditorWrapper>
   );