[core][fr] code cleaning