Refs #624: Remove "unset" option for contract type

Branch: 624-remove-choice
Merge pull request #624 from caktus/624-remove-choice

Post-585 remove choice of unset contract type