Removing the check for activeService as it did not make a difference when testing in the field (incl. Pat's system)