Remove hardcoding of LoginService