clean out of some old files
modernize energy.py