Removing the old stream type and adding a lot cleaner version.