Clean-up relevant to issue #8