Simplify the energy interface

Working on removing being_energy too.