Remove use of old self.login()