NXIO-333: Remove hardcoded service index