Additional logout cleanup