Do not keep archived threads around in memory.
Remove more stack traces
Remove more newlines for no good reason
Merge remote-tracking branch 'upstream/master'