[PATCH 03/14] Cleanup: avoid memory leak