Removed extra stream wrappers