Removed need to logout