clean up some of the debug output
A bunch more places that should be using calculated_country_code not country_code