cleaned up guest user code