Remove more energy consumer references