[f4m] Clean up
Fix imports