[PATCH 05/14] Cleanup: avoid memory leak