CLC-3410 Add TODO comments documenting future work to collapse duplicative models