cleanups, kill unnecessary ::Stream methods