remove cruft and improve pod for Country as per #134