minor cleanup on client instantiation and login session