Remove references to old service and CA cert