CSHM: Avoid data corruption (fixes #21)

Remove Configuration arg
Reformat