CHANGE: Remove vestiges of old system for accounting for the number of private cars - should improve performance slightly.