diff --git a/lib/form/filemanager.js b/lib/form/filemanager.js
index b383d1624ca..7f3f74fd8b6 100644
--- a/lib/form/filemanager.js
+++ b/lib/form/filemanager.js
@@ -88,9 +88,6 @@ M.form_filemanager.init = function(Y, options) {
             }
             // prepare filemanager for drag-and-drop upload
             this.filemanager = Y.one('#filemanager-'+options.client_id);
-            if (!this.filemanager) {
-                return;
-            }
             if (this.filemanager.hasClass('filemanager-container') || !this.filemanager.one('.filemanager-container')) {
                 this.dndcontainer = this.filemanager;
             } else  {
@@ -437,9 +434,6 @@ M.form_filemanager.init = function(Y, options) {
 
         print_path: function() {
             var p = this.options.path;
-            if (!this.pathbar) {
-                return;
-            }
             this.pathbar.setContent('').addClass('empty');
             if (p && p.length!=0 && this.viewmode != 2) {
                 for(var i = 0; i < p.length; i++) {
@@ -1059,9 +1053,6 @@ M.form_filemanager.init = function(Y, options) {
     // finally init everything needed
     // hide loading picture, display filemanager interface
     var filemanager = Y.one('#filemanager-'+options.client_id);
-    if (!filemanager) {
-       return;
-    }
     filemanager.removeClass('fm-loading').addClass('fm-loaded');
 
     var manager = new FileManagerHelper(options);
diff --git a/mod/data/edit.php b/mod/data/edit.php
index 6140f57a0ce..f6d98376f07 100644
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -298,12 +298,14 @@ if ($data->addtemplate){
     ///then we generate strings to replace
     foreach ($possiblefields as $eachfield){
         $field = data_get_field($eachfield, $data);
+
+        // To skip unnecessary calls to display_add_field().
         if (strpos($data->addtemplate, "[[".$field->field->name."]]") !== false) {
             $patterns[] = "[[".$field->field->name."]]";
             $replacements[] = $field->display_add_field($rid);
-            $patterns[] = "[[".$field->field->name."#id]]";
-            $replacements[] = 'field_'.$field->field->id;
         }
+        $patterns[] = "[[".$field->field->name."#id]]";
+        $replacements[] = 'field_'.$field->field->id;
     }
     $newtext = str_ireplace($patterns, $replacements, $data->{$mode});
 
diff --git a/mod/data/field/file/field.class.php b/mod/data/field/file/field.class.php
index 5ea4f564c6b..5fd2d215d2d 100644
--- a/mod/data/field/file/field.class.php
+++ b/mod/data/field/file/field.class.php
@@ -87,23 +87,6 @@ class data_field_file extends data_field_base {
         $html .= '</fieldset>';
         $html .= '</div>';
 
-        $module = array(
-            'name'=>'form_filemanager',
-            'fullpath'=>'/lib/form/filemanager.js',
-            'requires' => array('core_filepicker', 'base', 'io-base', 'node',
-                    'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
-            'strings' => array(
-                array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
-                array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
-                array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
-                array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
-                array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
-                array('confirmrenamefile', 'repository'), array('edit', 'moodle')
-            )
-        );
-
-        $PAGE->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module);
-
         return $html;
     }
 
diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index b3e378d6737..a459791f790 100644
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -101,23 +101,6 @@ class data_field_picture extends data_field_base {
         $str .= '</fieldset>';
         $str .= '</div>';
 
-        $module = array(
-            'name'=>'form_filemanager',
-            'fullpath'=>'/lib/form/filemanager.js',
-            'requires' => array('core_filepicker', 'base', 'io-base', 'node',
-                    'json', 'core_dndupload', 'panel', 'resize-plugin', 'dd-plugin'),
-            'strings' => array(
-                array('error', 'moodle'), array('info', 'moodle'), array('confirmdeletefile', 'repository'),
-                array('draftareanofiles', 'repository'), array('entername', 'repository'), array('enternewname', 'repository'),
-                array('invalidjson', 'repository'), array('popupblockeddownload', 'repository'),
-                array('unknownoriginal', 'repository'), array('confirmdeletefolder', 'repository'),
-                array('confirmdeletefilewithhref', 'repository'), array('confirmrenamefolder', 'repository'),
-                array('confirmrenamefile', 'repository'), array('edit', 'moodle')
-            )
-        );
-
-        $PAGE->requires->js_init_call('M.form_filemanager.init', array($fm->options), true, $module);
-
         return $str;
     }