Steady energy increase mainly removed, i.e. taken off TODO.