diff --git a/change-validation/README.adoc b/change-validation/README.adoc
index ad41fefad..1e357de4e 100644
--- a/change-validation/README.adoc
+++ b/change-validation/README.adoc
@@ -27,15 +27,6 @@ is optional and can be disabled at any time without any problem, besides risking
image::docs/images/Enabling.png[]
-== Rudder compatibility and breaking changes
-
-=== Version 5.0-1.1 needs Rudder 5.0.1 or above
-
-The problem was that on some condition, the change request was not saved in the correct data back-end: it was using the Rudder one in place of the plugin one.
-
-- Rudder ticket: https://issues.rudder.io/issues/13609
-- Plugin ticket: https://issues.rudder.io/issues/13630
-
== What is a Change request ?
diff --git a/change-validation/src/main/resources/template/ChangeValidationManagement.html b/change-validation/src/main/resources/template/ChangeValidationManagement.html
index d15b4e631..ad147b8f3 100644
--- a/change-validation/src/main/resources/template/ChangeValidationManagement.html
+++ b/change-validation/src/main/resources/template/ChangeValidationManagement.html
@@ -123,66 +123,65 @@ Change validation status
-
-
-
Configure email notification
-
-
-
You can modify the email's template of each steps here:
-
- -
- /var/rudder/plugins/change-validation/validation-mail.template
-
-
-
-
- -
- /var/rudder/plugins/change-validation/deployment-mail.template
-
-
-
-
- -
- /var/rudder/plugins/change-validation/cancelled-mail.template
-
-
-
-
- -
- /var/rudder/plugins/change-validation/deployed-mail.template
-
-
-
-
-
-
-
-
-
-
-
-
- By default, email notifications are disabled. To enable them, make sure that the
- smtp.hostServer parameter is
- not left empty in the configuration file:
- /opt/rudder/etc/plugins/change-validation.conf
-
-
-
-
-
+
Configure email notification
+
+
+
You can modify the email's template of each steps here:
+
+ -
+ /var/rudder/plugins/change-validation/validation-mail.template
+
+
+
+
+ -
+ /var/rudder/plugins/change-validation/deployment-mail.template
+
+
+
+
+ -
+ /var/rudder/plugins/change-validation/cancelled-mail.template
+
+
+
+
+ -
+ /var/rudder/plugins/change-validation/deployed-mail.template
+
+
+
+
+
+
+
+
+
+
+
+
+ By default, email notifications are disabled. To enable them, make sure that the
+ smtp.hostServer parameter is
+ not left empty in the configuration file:
+ /opt/rudder/etc/plugins/change-validation.conf
+
+
+
+
+
Configure change request triggers
diff --git a/glpi/etc/hooks.d/node-post-deletion/20-clean-inventories b/glpi/etc/hooks.d/node-post-deletion/20-clean-inventories
new file mode 100755
index 000000000..d382acad5
--- /dev/null
+++ b/glpi/etc/hooks.d/node-post-deletion/20-clean-inventories
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+# Hooks parameter are passed by environment variable:
+#
+# - RUDDER_NODE_ID: the nodeId
+# - RUDDER_NODE_HOSTNAME: the node fully qualified hostname
+# - RUDDER_NODE_POLICY_SERVER_ID: the node policy server id
+# - RUDDER_AGENT_TYPE : agent type ("cfengine-community" or "dsc")
+# - RUDDER_POLICIES_DIRECTORY_CURRENT: the full path of the base directory containing policies for that node
+# - RUDDER_POLICIES_DIRECTORY_NEW: the full path of the base directory containing next policies for that node (during a generation)
+# - RUDDER_POLICIES_DIRECTORY_ARCHIVE: the full path of the base directory containing previous policies for that node
+# - RUDDER_NODE_KIND: node kind: root, relay or node
+
+
+# Errors code on hooks are interpreted as follow:
+# - 0 : success, no log (apart if debug one) , continue to next hook
+# - 1-31 : error , error log in /var/log/rudder/webapp/, stop processing
+# - 32-63 : warning, warning log in /var/log/rudder/webapp/, continue to next hook
+# - 64-255: reserved for future use case. Behavior may change without notice.
+
+rm -f /var/rudder/inventories/received/${RUDDER_NODE_HOSTNAME}-${RUDDER_NODE_ID}.ocs*