Cleanup commit/close