Move timezone out of field groups, and hide country with configuration instead of code.