Some auth clean-up. Started verify logic