Clean-up consuming sensors

Optimize power usage