Replaced stream transforms with ConverterStream
Cleared out junk