Remove bare/full actor id distinction