Host/sensor cleanup 1