[PATCH 04/12] Cleanup: avoid memory leak