Stream & Trail Cleanups

Coming soon.