Cleaned up imports in EventsIncremental