remove dupe embedded user/group management

Change-Id: If025bbb30e8fbbcb2aa3f9b76b5be13e9d48ce97