Clean up merge of smbios code

Signed-off-by: Al Stone <ahs3@redhat.com>
Clean up merge of SNP code

Signed-off-by: Al Stone <ahs3@redhat.com>