CrowdSurge cleanup