reduce country code complexity
cleaned up sqlalchemy relationships