Replace the goto instead of erasing / inserting
Do not remove the call, transform it to NOP
Do not remove any statement, transform them to NOP
Merge branch 'feature/inlining_nop' into develop