Some cleanup on country view.