Ongoing work to remove france specific stuff