Fx: more cleanup