[core] code cleaning