Clean up of dumper statements

Realised also that if the samples file has an extra empty line, the
samples file will be invalid.
I'm not sure I want to keep this behaviour.