XD-1804: Remove 'substream' support

This is preliminary work to XD-1772 as discussed with @markfisher.  The @Ignore'd test will be addressed in PR for 1772, as it relates to that functionality