Issue #18: ensure we cleanup