DATA-1435 Clean-up of current OBIS structured data