complete migration to HS auth