simplify units

7 jobs for !89 with improve_energy_units in 10 minutes and 48 seconds (queued for 2 seconds)
latest merge request