REVIEW: Cleanup of NFE