Revert "Moved daemon hygiene action in the chain"

This reverts commit dbf725eaa030edfd149b1a5359d04c44493602f7.