COSMITS: remove spurious snippets + tiny fixes