Commented out stream_persist.h
Headers, work in progress.