Added login bypass / cleaned imports