PR Fixup: cleanup premature optimization
PR Fixup: kill cancel button
PR Fixup: js cleanup
PR Fixup: Make the stream a lot simpler