CROWDCON-6 Took out testing code