Add remove-metric and remove-rule procedures