add func to remove role only if needed