Bit of cleanup and teardown