remove energy meter, add event queues