add kWh; remove some unnecessary sections