Cleanup & update sensors