diff --git a/src/PSDesiredStateConfiguration/PSDesiredStateConfiguration.psm1 b/src/PSDesiredStateConfiguration/PSDesiredStateConfiguration.psm1
index eb2ca33..742803d 100644
--- a/src/PSDesiredStateConfiguration/PSDesiredStateConfiguration.psm1
+++ b/src/PSDesiredStateConfiguration/PSDesiredStateConfiguration.psm1
@@ -701,33 +701,6 @@ function ConvertTo-MOFInstance
         $OFS = $oldOFS
     }
 
-    #
-    # Add extra information about Author, GenerationHost, GenerationDate and Name if they are not specified
-    #
-    if ($Type -match 'OMI_ConfigurationDocument' -and $Properties)
-    {
-        if (-not $Properties.ContainsKey('Author'))
-        {
-            $result += " Author = `"$([system.environment]::UserName)`";`n"
-        }
-
-        if (-not $Properties.ContainsKey('GenerationDate'))
-        {
-            $result += " GenerationDate = `"$(Get-Date)`";`n"
-        }
-
-        if (-not $Properties.ContainsKey('GenerationHost'))
-        {
-            $result += " GenerationHost = `"$([system.environment]::MachineName)`";`n"
-        }
-
-        # todo: report error is configuration name does't match
-        if (-not $Properties.ContainsKey('Name'))
-        {
-            $result += " Name = `"$(Get-PSTopConfigurationName)`";`n"
-        }
-    }
-
     #
     # Append the completed mof instance text to the overall document
     #
@@ -2398,12 +2371,12 @@ function Update-ConfigurationDocumentRef
             $needAdd = $true
             $first = $instanceText.Substring(0, $curlyPosition).TrimEnd()
 
-            $ConfigurationNameRef = "`r`n ConfigurationName = `"$ConfigurationName`";"
+            $ConfigurationNameRef = "`n ConfigurationName = `"$ConfigurationName`";"
         }
 
         if($needAdd)
         {
-            $NodeInstanceAliases[$alias] = $first + $ConfigurationNameRef + "`r`n};"
+            $NodeInstanceAliases[$alias] = $first + $ConfigurationNameRef + "`n};`n"
         }
     }
 }
@@ -2456,7 +2429,7 @@ function Write-MetaConfigFile
     )
 
     # Set up prefix for both the configuration and metaconfiguration documents.
-    $nodeDoc = "/*`n@TargetNode='$mofNode'`n" + "@GeneratedBy=$([system.environment]::UserName)`n@GenerationDate=$(Get-Date)`n@GenerationHost=$([system.environment]::MachineName)`n*/`n"
+    $nodeDoc = $null
     $nodeConfigurationDocument = $null
     [int]$nodeDocCount = 0
     $resourceManagers = $null
@@ -2582,11 +2555,11 @@ function Write-MetaConfigFile
             Write-Debug -Message "  ${ConfigurationName}: Adding missing OMI_ConfigurationDocument element to the document"
             if($Script:NodesPasswordEncrypted[$mofNode])
             {
-                $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"$($script:PSMetaConfigDocumentInstVersionInfo['MinimumCompatibleVersion'])`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Author=`"$([system.environment]::UserName)`";`n GenerationDate=`"$(Get-Date)`";`n GenerationHost=`"$([system.environment]::MachineName)`";`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
+                $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"$($script:PSMetaConfigDocumentInstVersionInfo['MinimumCompatibleVersion'])`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
             }
             else
             {
-                $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"$($script:PSMetaConfigDocumentInstVersionInfo['MinimumCompatibleVersion'])`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Author=`"$([system.environment]::UserName)`";`n GenerationDate=`"$(Get-Date)`";`n GenerationHost=`"$([system.environment]::MachineName)`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
+                $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"$($script:PSMetaConfigDocumentInstVersionInfo['MinimumCompatibleVersion'])`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
             }
         }
     }
@@ -2688,7 +2661,7 @@ function Write-NodeMOFFile
     )
 
     # Set up prefix for both the configuration and metaconfiguration documents.
-    $nodeDoc = "/*`n@TargetNode='$mofNode'`n" + "@GeneratedBy=$([system.environment]::UserName)`n@GenerationDate=$(Get-Date)`n@GenerationHost=$([system.environment]::MachineName)`n*/`n"
+    $nodeDoc = $null
     $nodeMetaDoc = $nodeDoc
     $nodeConfigurationDocument = $null
     [int]$metaDocCount = 0
@@ -2746,11 +2719,11 @@ function Write-NodeMOFFile
             Write-Debug -Message "  ${ConfigurationName}: Adding missing OMI_ConfigurationDocument element to the document"
             if($Script:NodesPasswordEncrypted[$mofNode])
             {
-                $nodeMetaDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Author=`"$([system.environment]::UserName)`";`n GenerationDate=`"$(Get-Date)`";`n GenerationHost=`"$([system.environment]::MachineName)`";`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
+                $nodeMetaDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
             }
             else
             {
-                $nodeMetaDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Author=`"$([system.environment]::UserName)`";`n GenerationDate=`"$(Get-Date)`";`n GenerationHost=`"$([system.environment]::MachineName)`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
+                $nodeMetaDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= $(Get-CompatibleVersionAddtionaPropertiesStr);`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
             }
         }
     }
@@ -2769,56 +2742,22 @@ function Write-NodeMOFFile
             {
                 if($nodeDoc.Contains("PsDscRunAsCredential"))
                 {
-                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n
-                    {`n Version=`"2.0.0`";`n
-                        MinimumCompatibleVersion = `"2.0.0`";`n
-                        CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n
-                        Author=`"$([system.environment]::UserName)`";`n
-                        GenerationDate=`"$(Get-Date)`";`n
-                        GenerationHost=`"$([system.environment]::MachineName)`";`n
-                        ContentType=`"PasswordEncrypted`";`n
-                        Name=`"$(Get-PSTopConfigurationName)`";`n
-                    };"
+                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"2.0.0`";`n CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
                 }
                 else
                 {
-                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n
-                    {`n Version=`"2.0.0`";`n
-                        MinimumCompatibleVersion = `"1.0.0`";`n
-                        CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n
-                        Author=`"$([system.environment]::UserName)`";`n
-                        GenerationDate=`"$(Get-Date)`";`n
-                        GenerationHost=`"$([system.environment]::MachineName)`";`n
-                        ContentType=`"PasswordEncrypted`";`n
-                        Name=`"$(Get-PSTopConfigurationName)`";`n
-                    };"
+                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n ContentType=`"PasswordEncrypted`";`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
                 }
             }
             else
             {
                 if($nodeDoc.Contains("PsDscRunAsCredential"))
                 {
-                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n
-                    {`n Version=`"2.0.0`";`n
-                        MinimumCompatibleVersion = `"2.0.0`";`n
-                        CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n
-                        Author=`"$([system.environment]::UserName)`";`n
-                        GenerationDate=`"$(Get-Date)`";`n
-                        GenerationHost=`"$([system.environment]::MachineName)`";`n
-                        Name=`"$(Get-PSTopConfigurationName)`";`n
-                    };"
+                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"2.0.0`";`n CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
                 }
                 else
                 {
-                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n
-                    {`n Version=`"2.0.0`";`n
-                        MinimumCompatibleVersion = `"1.0.0`";`n
-                        CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n
-                        Author=`"$([system.environment]::UserName)`";`n
-                        GenerationDate=`"$(Get-Date)`";`n
-                        GenerationHost=`"$([system.environment]::MachineName)`";`n
-                        Name=`"$(Get-PSTopConfigurationName)`";`n
-                    };"
+                    $nodeDoc += "`ninstance of OMI_ConfigurationDocument`n{`n Version=`"2.0.0`";`n MinimumCompatibleVersion = `"1.0.0`";`n CompatibleVersionAdditionalProperties= {`"Omi_BaseResource:ConfigurationName`"};`n Name=`"$(Get-PSTopConfigurationName)`";`n};"
                 }
             }
         }