Default country to "None" rather than Germany.
Remove @todos from code / solving where necessary.