Unbundle stream comments and clean up