[fx] code cleaning