Fx: cleanup of imports