Clean up thread returns, remove bytestream queue (factor out), don't include poll, exit if EOF