[PATCH 04/14] Cleanup: avoid memory leak