Remove energy queue shenanigans.
Remove raw energy sensor class
Fix energy data collection
Remove more energy consumer references