Tidy up host and container sensors