diff --git a/question/type/calculatedmulti/edit_calculatedmulti_form.php b/question/type/calculatedmulti/edit_calculatedmulti_form.php
index 93a0a2af893..6848ae8bb01 100644
--- a/question/type/calculatedmulti/edit_calculatedmulti_form.php
+++ b/question/type/calculatedmulti/edit_calculatedmulti_form.php
@@ -143,11 +143,6 @@ class question_edit_calculatedmulti_form extends question_edit_form {
             $mform->addElement('hidden', 'multiplier'."[$i]", optional_param('multiplier'."[$i]", '', PARAM_NUMBER));
             $mform->setType('multiplier'."[$i]", PARAM_NUMBER);
         }
-        $mform->addElement('hidden','unitgradingtype',optional_param('unitgradingtype', '', PARAM_INT)) ;
-        $mform->addElement('hidden','unitpenalty',optional_param('unitpenalty', '', PARAM_NUMBER)) ;
-        $mform->addElement('hidden','showunits',optional_param('showunits', '', PARAM_INT)) ;
-        $mform->addElement('hidden','unitsleft',optional_param('unitsleft', '', PARAM_INT)) ;
-        $mform->addElement('hidden','instructions',optional_param('instructions', '', PARAM_RAW)) ;
 
         $mform->setType('addunits','hidden');
         $mform->addElement('header', 'overallfeedbackhdr', get_string('overallfeedback', 'qtype_multichoice'));
@@ -190,11 +185,6 @@ class question_edit_calculatedmulti_form extends question_edit_form {
                     $key++;
                 }
             }
-            //  $default_values['unitgradingtype'] = $question->options->unitgradingtype ;
-            //  $default_values['unitpenalty'] = $question->options->unitpenalty ;
-            //  $default_values['showunits'] = $question->options->showunits ;
-            //  $default_values['unitsleft'] = $question->options->unitsleft ;
-            //  $default_values['instructions'] = $question->options->instructions  ;
             $default_values['synchronize'] = $question->options->synchronize ;
 
             if (isset($question->options->units)){
diff --git a/question/type/calculatedmulti/questiontype.php b/question/type/calculatedmulti/questiontype.php
index c5b019ea3c2..3c05862b1bc 100644
--- a/question/type/calculatedmulti/questiontype.php
+++ b/question/type/calculatedmulti/questiontype.php
@@ -147,10 +147,6 @@ class question_calculatedmulti_qtype extends question_calculated_qtype {
                 $DB->delete_records('question_calculated', array('id' => $oo->id));
             }
         }
-        //  $result = $QTYPES['numerical']->save_numerical_options($question);
-        //  if (isset($result->error)) {
-        //      return $result;
-        //  }
 
 
         if( isset($question->import_process)&&$question->import_process){