Removed conditional checks on Logout for simplicity