gapz_code_injection: clean variables definitions