XD-1712 StreamUtil Cleanup