Clean up old code
Log progress into file when importing all countries #2294