Clean on logout, removed getattr calls