Tidy up crappy benchmark.

Should be using caliper.
Revert "Moving out RawTextFileFormat"

This reverts commit ce18cb6d9105511b3bc2d926db71c01ceb1fca45.

The commit was based on a misunderstanding of input formats.

Since there is no second user of the format, revert it to being private.