Switch to using datainsight_collector

Old code not deleted yet - TBD

@maxfliri
@pbadenski