Cleanup after big bug hunt