Removes some properties that are no longer used
and makes a minor change to the total_time component
naming for consistency