CROWDCON-4 Cleanup