remove some of the verification queries after keystone init