[PATCH 05/12] Cleanup: avoid memory leak