major clean-up of InformaService access