More LFI cleanup