Merge "Purge un-needed references to lithium stream"