[gpac] Clean up