Removed the unused streaming functions/templates