Revert "Hard match on instance instead of startswith"

This reverts commit 57f003354025dc803e6b5ba37e8cd1e41e2afa4f.
Revert "Updated to generate only consolidated points"

This reverts commit 5a5fe6a5daf2aabc5ae6b541f4d376797ba1f199.