Remove unneccessary login; simplify script