[fx] some cleaning