FEA cleanup