Prep for future live stream scenario
cleanup
forum feedback