Updates after removal of overrides.