AS: Added cleanup to ServerStateDetectors