Further remove single guest user

@liuhenry