Remove direct coupling of ASG rules and Discovery client