collector: adding protean Cleanup() method.  Tests.