Further remove singe guest user

@liuhenry