[core] gc engine: code cleaning