Removed the allow-extra-data-values option.
This reverts parts of e477141.
Data values could never go past 15 anyway,
making the option pointless and misleading.