Clean metrics *before* hashing take places

This will allow to control when those metrics are moved instead of
relying on people cleaning their metric