Cleanup and convert to stream server