Fix CSV only showing data for the first device.  Clean up obsolete code from previous commit.