XD-1804: Remove 'substream' support