CROWDCON-6 removed return