diff --git a/src/message.rs b/src/message.rs
index 6473439..fa7079c 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1139,8 +1139,6 @@ mod fields {
 struct FieldSetting {
     fieldtype: FieldType,
     default_value: Option<Calculation>,
-    // use_default: bool,
-    // default_value: Field,
 }
 
 impl FieldSetting {
@@ -1148,8 +1146,6 @@ impl FieldSetting {
         Self {
             fieldtype: ftype,
             default_value: None,
-            // use_default: false,
-            // default_value: Field::None,
         }
     }
 
@@ -1163,23 +1159,6 @@ impl FieldSetting {
         Ok(())
     }
 
-    /*
-    fn set_default(&mut self, value: Option<Field>) -> Result<(), MTTError> {
-        match value {
-            Some(data) => {
-                match self.validate(Some(data.clone())) {
-                    Ok(_) => {}
-                    Err(err) => return Err(err),
-                }
-                self.default_value = data.clone();
-            }
-            None => self.default_value = Field::None,
-        }
-        self.use_default = true;
-        Ok(())
-    }
-    */
-
     fn validate(&self, value: Option<Field>) -> Result<Field, MTTError> {
         match value {
             Some(data) => {
@@ -1197,16 +1176,6 @@ impl FieldSetting {
                     Some(calc) => Ok(calc.calculate()),
                     None => Err(MTTError::DocumentFieldMissing("".to_string())),
                 }
-                /*
-                if self.use_default {
-                    match self.default_value {
-                        Field::None => Ok(self.fieldtype.get_default()),
-                        _ => Ok(self.default_value.clone()),
-                    }
-                } else {
-                    Err(MTTError::DocumentFieldMissing("".to_string()))
-                }
-                */
             }
         }
     }