Removing token parameter from service methods