diff --git a/app/views/exercises/_code_field.html.slim b/app/views/exercises/_code_field.html.slim
index a5b2a48d..4fedfcea 100644
--- a/app/views/exercises/_code_field.html.slim
+++ b/app/views/exercises/_code_field.html.slim
@@ -4,6 +4,6 @@
   a.toggle-input data={text_initial: t('shared.upload_file'), text_toggled: t('shared.back')} href='#' = t('shared.upload_file')
   = form.text_area(attribute, class: 'code-field form-control original-input', rows: 16)
   // Need to render content in ace editor instead of plain text
-  /= render('editor_frame', exercise: @exercise, file: @exercise.files.first)
+  = render('editor_frame', exercise: e, file: @files)
   = form.file_field(attribute, class: 'alternative-input form-control', disabled: true)
 
diff --git a/app/views/exercises/_file_form.html.slim b/app/views/exercises/_file_form.html.slim
index 0f22260c..618f6d12 100644
--- a/app/views/exercises/_file_form.html.slim
+++ b/app/views/exercises/_file_form.html.slim
@@ -37,8 +37,4 @@ li.panel.panel-default
         .form-group
           = f.label(:role, t('activerecord.attributes.file.weight'))
           = f.number_field(:weight, class: 'form-control', min: 1, step: 'any')
-        = render('code_field', attribute: :content, form: f, exercise: @exercise, files: @exercise.files, label: t('activerecord.attributes.file.content'))
-
-        /=render('editor', exercise: @exercise, files: @files, submission: @submission)
-        /= render('editor_frame', exercise: @exercise, file: @exercise.files.take)
-
+        = render('code_field', attribute: :content, form: f, label: t('activerecord.attributes.file.content'))
diff --git a/app/views/exercises/_form.html.slim b/app/views/exercises/_form.html.slim
index d56e2ae4..f0f69f7a 100644
--- a/app/views/exercises/_form.html.slim
+++ b/app/views/exercises/_form.html.slim
@@ -36,9 +36,7 @@
   ul#files.list-unstyled.panel-group
     = f.fields_for :files do |files_form|
       = render('file_form', f: files_form)
-  /a#add-file.btn.btn-default.btn-sm.pull-right href='#' = t('.add_file')
-    = render('editor', exercise: @exercise, files: @files, submission: @submission)
+  a#add-file.btn.btn-default.btn-sm.pull-right href='#' = t('.add_file')
   ul#dummies.hidden = f.fields_for(:files, CodeOcean::File.new, child_index: 'index') do |files_form|
-    = render('file_form', f: files_form, exercise: @exercise)
-    /= render('editor2', exercise: @exercise, files: @exercise.files, submission: @submission)
+    = render('file_form', f: files_form)
   .actions = render('shared/submit_button', f: f, object: @exercise)