[build][core] small code cleaning