[PATCH 02/14] Cleanup: avoid memory leaks