More energy updates

Moving towards GET_E removal.