Clean up remaining bad SFAs