Remove experimental new class from collate