Remove role usage, for now