Energy is done

I removed the advanced version for now (will be added back) and removed
the accumulators primary and secondary