fi cleanup