diff --git a/azurelinuxagent/pa/deprovision/default.py b/azurelinuxagent/pa/deprovision/default.py
index edf736811..35b4ae82e 100644
--- a/azurelinuxagent/pa/deprovision/default.py
+++ b/azurelinuxagent/pa/deprovision/default.py
@@ -158,7 +158,11 @@ def del_lib_dir_files(self, warnings, actions):  # pylint: disable=W0613
             'partition',
             'Protocol',
             'SharedConfig.xml',
-            'WireServerEndpoint'
+            'WireServerEndpoint',
+            'published_hostname',
+            'fast_track.json',
+            'initial_goal_state',
+            'rsm_update.json'
         ]
         known_files_glob = [
             'Extensions.*.xml',
diff --git a/azurelinuxagent/pa/provision/default.py b/azurelinuxagent/pa/provision/default.py
index 91fe04eda..a872d70fd 100644
--- a/azurelinuxagent/pa/provision/default.py
+++ b/azurelinuxagent/pa/provision/default.py
@@ -172,9 +172,11 @@ def check_provisioned_file(self):
         s = fileutil.read_file(ProvisionHandler.provisioned_file_path()).strip()
         if not self.osutil.is_current_instance_id(s):
             if len(s) > 0:
-                logger.warn("VM is provisioned, "
-                            "but the VM unique identifier has changed -- "
-                            "clearing cached state")
+                msg = "VM is provisioned, but the VM unique identifier has changed. This indicates the VM may be " \
+                      "created from an image that was not properly deprovisioned or generalized, which can result in " \
+                      "unexpected behavior from the guest agent -- clearing cached state"
+                logger.warn(msg)
+                self.report_event(msg)
                 from azurelinuxagent.pa.deprovision \
                     import get_deprovision_handler
                 deprovision_handler = get_deprovision_handler()