Revert "Refactoring to allow multiple endpoint types in StateViews"

This reverts commit 9ec28cd8d23ec18f5f5901e4dee8f8b166e3bd4f.