Lots of tidy up (removing MaxMind elements)