some cleanup after the energy update and some removal of unneeded checks