diff --git a/crc/crc16_t10dif_01.asm b/crc/crc16_t10dif_01.asm
index 536b6f3..dcfcc6b 100644
--- a/crc/crc16_t10dif_01.asm
+++ b/crc/crc16_t10dif_01.asm
@@ -660,7 +660,3 @@ pshufb_shf_table:
 ;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
 dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-;;;       func          core, ver, snum
-slversion crc16_t10dif_01, 01,   06,  0010
-
diff --git a/crc/crc16_t10dif_by4.asm b/crc/crc16_t10dif_by4.asm
index 1326eb2..b126c8d 100644
--- a/crc/crc16_t10dif_by4.asm
+++ b/crc/crc16_t10dif_by4.asm
@@ -558,6 +558,3 @@ pshufb_shf_table:
 ;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
 dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-;;;       func             core, ver, snum
-slversion crc16_t10dif_by4, 05,   02,  0016
diff --git a/crc/crc16_t10dif_copy_by4.asm b/crc/crc16_t10dif_copy_by4.asm
index b8a6838..ea16eeb 100644
--- a/crc/crc16_t10dif_copy_by4.asm
+++ b/crc/crc16_t10dif_copy_by4.asm
@@ -594,6 +594,3 @@ pshufb_shf_table:
 ;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
 dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-;;;       func                   core, ver, snum
-slversion crc16_t10dif_copy_by4, 05,   02,  0000
diff --git a/crc/crc32_gzip_refl_by8.asm b/crc/crc32_gzip_refl_by8.asm
index 4384024..fa7dbb7 100644
--- a/crc/crc32_gzip_refl_by8.asm
+++ b/crc/crc32_gzip_refl_by8.asm
@@ -620,6 +620,3 @@ pshufb_shf_table:
 ;       dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
 dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-;;;       func        core, ver, snum
-slversion crc32_gzip_refl_by8, 01,   00,  002c
diff --git a/crc/crc32_ieee_01.asm b/crc/crc32_ieee_01.asm
index 368261d..08b8e9c 100644
--- a/crc/crc32_ieee_01.asm
+++ b/crc/crc32_ieee_01.asm
@@ -650,7 +650,3 @@ pshufb_shf_table:
 ;	dq 0x060504030201008f, 0x0e0d0c0b0a090807 ; shl 1  (16-15) / shr15
 dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x000e0d0c0b0a0908
-
-;;;       func        core, ver, snum
-slversion crc32_ieee_01, 01,   06,  0011
-
diff --git a/crc/crc32_ieee_by4.asm b/crc/crc32_ieee_by4.asm
index f432640..a6fcdf1 100644
--- a/crc/crc32_ieee_by4.asm
+++ b/crc/crc32_ieee_by4.asm
@@ -561,6 +561,3 @@ pshufb_shf_table:
 
 
 SHUF_MASK	dq 0x08090A0B0C0D0E0F, 0x0001020304050607
-
-;;;       func             core, ver, snum
-slversion crc32_ieee_by4, 05,   02,  0017
diff --git a/crc/crc32_iscsi_00.asm b/crc/crc32_iscsi_00.asm
index 1a5e029..3f76bbd 100644
--- a/crc/crc32_iscsi_00.asm
+++ b/crc/crc32_iscsi_00.asm
@@ -36,6 +36,8 @@
 %include "reg_sizes.asm"
 
 default rel
+section .text
+
 ; crcB3 MACRO to implement crc32 on 3 %%bSize-byte blocks
 %macro  crcB3 3
 %define %%bSize   %1    ; 1/3 of buffer size
@@ -666,7 +668,3 @@ DD 0xd875c27e,0x051309c5,0x675423f9,0xba32e842
 DD 0xa3da7781,0x7ebcbc3a,0x1cfb9606,0xc19d5dbd
 DD 0x2f2aa980,0xf24c623b,0x900b4807,0x4d6d83bc
 DD 0x54851c7f,0x89e3d7c4,0xeba4fdf8,0x36c23643
-
-;;;       func            core, ver, snum
-slversion crc32_iscsi_00, 00,   04,  0014
-
diff --git a/crc/crc32_iscsi_01.asm b/crc/crc32_iscsi_01.asm
index e0f2b5e..a3d8c70 100644
--- a/crc/crc32_iscsi_01.asm
+++ b/crc/crc32_iscsi_01.asm
@@ -32,6 +32,8 @@
 %include "reg_sizes.asm"
 
 default rel
+section .text
+
 %define CONCAT(a,b,c)   a %+ b %+ c
 
 ; Define threshold where buffers are considered "small" and routed to more
@@ -586,7 +588,3 @@ K_table:
 	dq 0x045cddf4e, 0x0e0ac139e
 	dq 0x1a91647f2, 0x169cf9eb0
 	dq 0x1a0f717c4, 0x0170076fa
-
-;;;       func            core, ver, snum
-slversion crc32_iscsi_01, 01,   04,  0015
-
diff --git a/crc/crc64_base.c b/crc/crc64_base.c
index 7cf5a69..cb41312 100644
--- a/crc/crc64_base.c
+++ b/crc/crc64_base.c
@@ -886,27 +886,3 @@ uint64_t crc64_jones_norm_base(uint64_t seed, const uint8_t * buf, uint64_t len)
 
 	return ~crc;
 }
-
-struct slver {
-	unsigned short snum;
-	unsigned char ver;
-	unsigned char core;
-};
-
-struct slver crc64_ecma_refl_base_slver_0000001c;
-struct slver crc64_ecma_refl_base_slver = { 0x001c, 0x00, 0x00 };
-
-struct slver crc64_ecma_norm_base_slver_00000019;
-struct slver crc64_ecma_norm_base_slver = { 0x0019, 0x00, 0x00 };
-
-struct slver crc64_iso_refl_base_slver_00000022;
-struct slver crc64_iso_refl_base_slver = { 0x0022, 0x00, 0x00 };
-
-struct slver crc64_iso_norm_base_slver_0000001f;
-struct slver crc64_iso_norm_base_slver = { 0x001f, 0x00, 0x00 };
-
-struct slver crc64_jones_refl_base_slver_00000028;
-struct slver crc64_jones_refl_base_slver = { 0x0028, 0x00, 0x00 };
-
-struct slver crc64_jones_norm_base_slver_00000025;
-struct slver crc64_jones_norm_base_slver = { 0x0025, 0x00, 0x00 };
diff --git a/crc/crc64_ecma_norm_by8.asm b/crc/crc64_ecma_norm_by8.asm
index ca99e34..31e6177 100644
--- a/crc/crc64_ecma_norm_by8.asm
+++ b/crc/crc64_ecma_norm_by8.asm
@@ -579,6 +579,3 @@ dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_ecma_norm_by8, 01,   00,  001a
diff --git a/crc/crc64_ecma_refl_by8.asm b/crc/crc64_ecma_refl_by8.asm
index c09ddfa..36b9792 100644
--- a/crc/crc64_ecma_refl_by8.asm
+++ b/crc/crc64_ecma_refl_by8.asm
@@ -544,6 +544,3 @@ mask2:
 dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3:
 dq     0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_ecma_refl_by8, 01,   00,  001d
diff --git a/crc/crc64_iso_norm_by8.asm b/crc/crc64_iso_norm_by8.asm
index 16147d5..3631fba 100644
--- a/crc/crc64_iso_norm_by8.asm
+++ b/crc/crc64_iso_norm_by8.asm
@@ -577,6 +577,3 @@ dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_iso_norm_by8, 01,   00,  0020
diff --git a/crc/crc64_iso_refl_by8.asm b/crc/crc64_iso_refl_by8.asm
index b6dfcf0..7f5f7b0 100644
--- a/crc/crc64_iso_refl_by8.asm
+++ b/crc/crc64_iso_refl_by8.asm
@@ -540,6 +540,3 @@ mask2:
 dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3:
 dq     0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_iso_refl_by8, 01,   00,  0023
diff --git a/crc/crc64_jones_norm_by8.asm b/crc/crc64_jones_norm_by8.asm
index 0cf8b4a..6d6ae2e 100644
--- a/crc/crc64_jones_norm_by8.asm
+++ b/crc/crc64_jones_norm_by8.asm
@@ -577,6 +577,3 @@ dq 0x8786858483828100, 0x8f8e8d8c8b8a8988
 dq 0x0706050403020100, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x0f0e0d0c0b0a0908
 dq 0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_jones_norm_by8, 01,   00,  0026
diff --git a/crc/crc64_jones_refl_by8.asm b/crc/crc64_jones_refl_by8.asm
index eea9c8d..88faa50 100644
--- a/crc/crc64_jones_refl_by8.asm
+++ b/crc/crc64_jones_refl_by8.asm
@@ -540,6 +540,3 @@ mask2:
 dq     0xFFFFFFFF00000000, 0xFFFFFFFFFFFFFFFF
 mask3:
 dq     0x8080808080808080, 0x8080808080808080
-
-;;;       func        core, ver, snum
-slversion crc64_jones_refl_by8, 01,   00,  0029
diff --git a/crc/crc64_multibinary.asm b/crc/crc64_multibinary.asm
index 3e06a0e..57d4d2e 100644
--- a/crc/crc64_multibinary.asm
+++ b/crc/crc64_multibinary.asm
@@ -82,11 +82,3 @@ mbin_interface			crc64_jones_refl
 mbin_dispatch_init7		crc64_jones_refl, crc64_jones_refl_base, crc64_jones_refl_by8, crc64_jones_refl_by8, crc64_jones_refl_by8, crc64_jones_refl_by8, crc64_jones_refl_by16_10
 mbin_interface			crc64_jones_norm
 mbin_dispatch_init7		crc64_jones_norm, crc64_jones_norm_base, crc64_jones_norm_by8, crc64_jones_norm_by8, crc64_jones_norm_by8, crc64_jones_norm_by8, crc64_jones_norm_by16_10
-
-;;;       func            	core, ver, snum
-slversion crc64_ecma_refl,	00,   00,  001b
-slversion crc64_ecma_norm,	00,   00,  0018
-slversion crc64_iso_refl,	00,   00,  0021
-slversion crc64_iso_norm,	00,   00,  001e
-slversion crc64_jones_refl,	00,   00,  0027
-slversion crc64_jones_norm,	00,   00,  0024
diff --git a/crc/crc_base.c b/crc/crc_base.c
index d1eb2d2..7267f4f 100644
--- a/crc/crc_base.c
+++ b/crc/crc_base.c
@@ -331,21 +331,3 @@ uint32_t crc32_gzip_refl_base(uint32_t seed, uint8_t * buf, uint64_t len)
 
 	return ~crc;
 }
-
-struct slver {
-	unsigned short snum;
-	unsigned char ver;
-	unsigned char core;
-};
-
-struct slver crc32_iscsi_base_slver_0001011d;
-struct slver crc32_iscsi_base_slver = { 0x011d, 0x02, 0x00 };
-
-struct slver crc16_t10dif_base_slver_0001011e;
-struct slver crc16_t10dif_base_slver = { 0x011e, 0x02, 0x00 };
-
-struct slver crc32_ieee_base_slver_0001011f;
-struct slver crc32_ieee_base_slver = { 0x011f, 0x02, 0x00 };
-
-struct slver crc32_gzip_refl_base_slver_0000002b;
-struct slver crc32_gzip_refl_base_slver = { 0x002b, 0x00, 0x00 };
diff --git a/crc/crc_multibinary.asm b/crc/crc_multibinary.asm
index a28a468..91396d6 100644
--- a/crc/crc_multibinary.asm
+++ b/crc/crc_multibinary.asm
@@ -320,9 +320,3 @@ mbin_dispatch_init_clmul	crc32_gzip_refl, crc32_gzip_refl_base, crc32_gzip_refl_
 
 mbin_interface			crc16_t10dif_copy
 mbin_dispatch_init_clmul	crc16_t10dif_copy, crc16_t10dif_copy_base, crc16_t10dif_copy_by4, crc16_t10dif_copy_by4_02, crc16_t10dif_copy_by4_02
-
-;;;       func            	core, ver, snum
-slversion crc16_t10dif,		00,   03,  011a
-slversion crc32_ieee,		00,   03,  011b
-slversion crc32_iscsi,		00,   03,  011c
-slversion crc32_gzip_refl,		00,   00,  002a
diff --git a/erasure_code/ec_base.c b/erasure_code/ec_base.c
index c0423cf..51260a7 100644
--- a/erasure_code/ec_base.c
+++ b/erasure_code/ec_base.c
@@ -338,34 +338,3 @@ void gf_vect_mul_base(int len, unsigned char *a, unsigned char *src, unsigned ch
 	while (len-- > 0)
 		*dest++ = gf_mul(c, *src++);
 }
-
-struct slver {
-	unsigned short snum;
-	unsigned char ver;
-	unsigned char core;
-};
-
-// Version info
-struct slver gf_vect_mul_init_slver_00020035;
-struct slver gf_vect_mul_init_slver = { 0x0035, 0x02, 0x00 };
-
-struct slver ec_encode_data_base_slver_00010135;
-struct slver ec_encode_data_base_slver = { 0x0135, 0x01, 0x00 };
-
-struct slver gf_vect_mul_base_slver_00010136;
-struct slver gf_vect_mul_base_slver = { 0x0136, 0x01, 0x00 };
-
-struct slver gf_vect_dot_prod_base_slver_00010137;
-struct slver gf_vect_dot_prod_base_slver = { 0x0137, 0x01, 0x00 };
-
-struct slver gf_mul_slver_00000214;
-struct slver gf_mul_slver = { 0x0214, 0x00, 0x00 };
-
-struct slver gf_invert_matrix_slver_00000215;
-struct slver gf_invert_matrix_slver = { 0x0215, 0x00, 0x00 };
-
-struct slver gf_gen_rs_matrix_slver_00000216;
-struct slver gf_gen_rs_matrix_slver = { 0x0216, 0x00, 0x00 };
-
-struct slver gf_gen_cauchy1_matrix_slver_00000217;
-struct slver gf_gen_cauchy1_matrix_slver = { 0x0217, 0x00, 0x00 };
diff --git a/erasure_code/ec_highlevel_func.c b/erasure_code/ec_highlevel_func.c
index a9fe6ab..67dd65d 100644
--- a/erasure_code/ec_highlevel_func.c
+++ b/erasure_code/ec_highlevel_func.c
@@ -359,16 +359,3 @@ void ec_encode_data_update_avx2(int len, int k, int rows, int vec_i, unsigned ch
 
 #endif //__WORDSIZE == 64 || _WIN64 || __x86_64__
 #endif //__x86_64__  || __i386__ || _M_X64 || _M_IX86
-
-struct slver {
-	unsigned short snum;
-	unsigned char ver;
-	unsigned char core;
-};
-
-// Version info
-struct slver ec_init_tables_slver_00010068;
-struct slver ec_init_tables_slver = { 0x0068, 0x01, 0x00 };
-
-struct slver ec_encode_data_sse_slver_00020069;
-struct slver ec_encode_data_sse_slver = { 0x0069, 0x02, 0x00 };
diff --git a/erasure_code/ec_multibinary.asm b/erasure_code/ec_multibinary.asm
index a07f45d..c05241b 100644
--- a/erasure_code/ec_multibinary.asm
+++ b/erasure_code/ec_multibinary.asm
@@ -86,10 +86,3 @@ mbin_interface gf_vect_mad
  mbin_dispatch_init6 gf_vect_mad, gf_vect_mad_base, gf_vect_mad_sse, gf_vect_mad_avx, gf_vect_mad_avx2, gf_vect_mad_avx512
  mbin_dispatch_init6 gf_vect_dot_prod, gf_vect_dot_prod_base, gf_vect_dot_prod_sse, gf_vect_dot_prod_avx, gf_vect_dot_prod_avx2, gf_vect_dot_prod_avx512
 %endif
-
-;;;       func                 		core, ver, snum
-slversion ec_encode_data,		00,   06,  0133
-slversion gf_vect_mul,			00,   05,  0134
-slversion ec_encode_data_update,	00,   05,  0212
-slversion gf_vect_dot_prod,		00,   05,  0138
-slversion gf_vect_mad,			00,   04,  0213
diff --git a/erasure_code/gf_2vect_dot_prod_avx.asm b/erasure_code/gf_2vect_dot_prod_avx.asm
index cfbc2eb..bbcd19e 100644
--- a/erasure_code/gf_2vect_dot_prod_avx.asm
+++ b/erasure_code/gf_2vect_dot_prod_avx.asm
@@ -332,6 +332,3 @@ section .data
 
 align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_2vect_dot_prod_avx, 02,  05,  0191
diff --git a/erasure_code/gf_2vect_dot_prod_avx2.asm b/erasure_code/gf_2vect_dot_prod_avx2.asm
index a06f67a..0118774 100644
--- a/erasure_code/gf_2vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_2vect_dot_prod_avx2.asm
@@ -349,8 +349,3 @@ func(gf_2vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                   core, ver, snum
-slversion gf_2vect_dot_prod_avx2, 04,  05,  0196
diff --git a/erasure_code/gf_2vect_dot_prod_sse.asm b/erasure_code/gf_2vect_dot_prod_sse.asm
index f7e44e7..6756ed1 100644
--- a/erasure_code/gf_2vect_dot_prod_sse.asm
+++ b/erasure_code/gf_2vect_dot_prod_sse.asm
@@ -334,6 +334,3 @@ section .data
 
 align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_2vect_dot_prod_sse, 00,  04,  0062
diff --git a/erasure_code/gf_2vect_mad_avx.asm b/erasure_code/gf_2vect_mad_avx.asm
index 995c36b..932d233 100644
--- a/erasure_code/gf_2vect_mad_avx.asm
+++ b/erasure_code/gf_2vect_mad_avx.asm
@@ -231,6 +231,3 @@ section .data
 
 align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func             core, ver, snum
-slversion gf_2vect_mad_avx, 02,  01,  0204
diff --git a/erasure_code/gf_2vect_mad_avx2.asm b/erasure_code/gf_2vect_mad_avx2.asm
index 751677d..13d1b78 100644
--- a/erasure_code/gf_2vect_mad_avx2.asm
+++ b/erasure_code/gf_2vect_mad_avx2.asm
@@ -240,8 +240,3 @@ func(gf_2vect_mad_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func              core, ver, snum
-slversion gf_2vect_mad_avx2, 04,  01,  0205
diff --git a/erasure_code/gf_2vect_mad_sse.asm b/erasure_code/gf_2vect_mad_sse.asm
index 2bff82f..13f0d6c 100644
--- a/erasure_code/gf_2vect_mad_sse.asm
+++ b/erasure_code/gf_2vect_mad_sse.asm
@@ -234,6 +234,3 @@ align 16
 
 mask0f:
 	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func             core, ver, snum
-slversion gf_2vect_mad_sse, 00,  01,  0203
diff --git a/erasure_code/gf_3vect_dot_prod_avx.asm b/erasure_code/gf_3vect_dot_prod_avx.asm
index 79c7ed4..6f0527b 100644
--- a/erasure_code/gf_3vect_dot_prod_avx.asm
+++ b/erasure_code/gf_3vect_dot_prod_avx.asm
@@ -372,6 +372,3 @@ section .data
 
 align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_3vect_dot_prod_avx, 02,  05,  0192
diff --git a/erasure_code/gf_3vect_dot_prod_avx2.asm b/erasure_code/gf_3vect_dot_prod_avx2.asm
index 606c3a1..16dee3e 100644
--- a/erasure_code/gf_3vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_3vect_dot_prod_avx2.asm
@@ -390,8 +390,3 @@ func(gf_3vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                   core, ver, snum
-slversion gf_3vect_dot_prod_avx2, 04,  05,  0197
diff --git a/erasure_code/gf_3vect_dot_prod_sse.asm b/erasure_code/gf_3vect_dot_prod_sse.asm
index d52c72b..53c706c 100644
--- a/erasure_code/gf_3vect_dot_prod_sse.asm
+++ b/erasure_code/gf_3vect_dot_prod_sse.asm
@@ -373,6 +373,3 @@ section .data
 
 align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_3vect_dot_prod_sse, 00,  06,  0063
diff --git a/erasure_code/gf_3vect_mad_avx.asm b/erasure_code/gf_3vect_mad_avx.asm
index 13963f6..5f66590 100644
--- a/erasure_code/gf_3vect_mad_avx.asm
+++ b/erasure_code/gf_3vect_mad_avx.asm
@@ -283,6 +283,3 @@ align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_3vect_mad_avx, 02,  01,  0207
diff --git a/erasure_code/gf_3vect_mad_avx2.asm b/erasure_code/gf_3vect_mad_avx2.asm
index 797d954..794e0e7 100644
--- a/erasure_code/gf_3vect_mad_avx2.asm
+++ b/erasure_code/gf_3vect_mad_avx2.asm
@@ -312,6 +312,3 @@ align 32
 constip32:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
 	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7
-
-;;;       func              core, ver, snum
-slversion gf_3vect_mad_avx2, 04,  01,  0208
diff --git a/erasure_code/gf_3vect_mad_sse.asm b/erasure_code/gf_3vect_mad_sse.asm
index c0fd0b9..2d7c473 100644
--- a/erasure_code/gf_3vect_mad_sse.asm
+++ b/erasure_code/gf_3vect_mad_sse.asm
@@ -293,6 +293,3 @@ mask0f:
 	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_3vect_mad_sse, 00,  01,  0206
diff --git a/erasure_code/gf_4vect_dot_prod_avx.asm b/erasure_code/gf_4vect_dot_prod_avx.asm
index bad8692..9da105e 100644
--- a/erasure_code/gf_4vect_dot_prod_avx.asm
+++ b/erasure_code/gf_4vect_dot_prod_avx.asm
@@ -436,6 +436,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_4vect_dot_prod_avx, 02,  05,  0193
diff --git a/erasure_code/gf_4vect_dot_prod_avx2.asm b/erasure_code/gf_4vect_dot_prod_avx2.asm
index e422e28..fcf0302 100644
--- a/erasure_code/gf_4vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_4vect_dot_prod_avx2.asm
@@ -453,8 +453,3 @@ func(gf_4vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                   core, ver, snum
-slversion gf_4vect_dot_prod_avx2, 04,  05,  0198
diff --git a/erasure_code/gf_4vect_dot_prod_sse.asm b/erasure_code/gf_4vect_dot_prod_sse.asm
index 25b5cff..81f1f36 100644
--- a/erasure_code/gf_4vect_dot_prod_sse.asm
+++ b/erasure_code/gf_4vect_dot_prod_sse.asm
@@ -438,6 +438,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_4vect_dot_prod_sse, 00,  06,  0064
diff --git a/erasure_code/gf_4vect_mad_avx.asm b/erasure_code/gf_4vect_mad_avx.asm
index 3a00623..9b5f52c 100644
--- a/erasure_code/gf_4vect_mad_avx.asm
+++ b/erasure_code/gf_4vect_mad_avx.asm
@@ -331,6 +331,3 @@ align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_4vect_mad_avx, 02,  01,  020a
diff --git a/erasure_code/gf_4vect_mad_avx2.asm b/erasure_code/gf_4vect_mad_avx2.asm
index e1cf910..c173fe2 100644
--- a/erasure_code/gf_4vect_mad_avx2.asm
+++ b/erasure_code/gf_4vect_mad_avx2.asm
@@ -337,6 +337,3 @@ align 32
 constip32:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
 	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7
-
-;;;       func              core, ver, snum
-slversion gf_4vect_mad_avx2, 04,  01,  020b
diff --git a/erasure_code/gf_4vect_mad_sse.asm b/erasure_code/gf_4vect_mad_sse.asm
index d5efc97..bf81e2e 100644
--- a/erasure_code/gf_4vect_mad_sse.asm
+++ b/erasure_code/gf_4vect_mad_sse.asm
@@ -337,6 +337,3 @@ mask0f:
 	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_4vect_mad_sse, 00,  01,  0209
diff --git a/erasure_code/gf_5vect_dot_prod_avx.asm b/erasure_code/gf_5vect_dot_prod_avx.asm
index a5bdb2a..d78bb52 100644
--- a/erasure_code/gf_5vect_dot_prod_avx.asm
+++ b/erasure_code/gf_5vect_dot_prod_avx.asm
@@ -298,6 +298,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_5vect_dot_prod_avx, 02,  04,  0194
diff --git a/erasure_code/gf_5vect_dot_prod_avx2.asm b/erasure_code/gf_5vect_dot_prod_avx2.asm
index d019e97..d21c35b 100644
--- a/erasure_code/gf_5vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_5vect_dot_prod_avx2.asm
@@ -308,8 +308,3 @@ func(gf_5vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                  core, ver, snum
-slversion gf_5vect_dot_prod_avx2, 04,  04,  0199
diff --git a/erasure_code/gf_5vect_dot_prod_sse.asm b/erasure_code/gf_5vect_dot_prod_sse.asm
index c96bed5..4a6b37c 100644
--- a/erasure_code/gf_5vect_dot_prod_sse.asm
+++ b/erasure_code/gf_5vect_dot_prod_sse.asm
@@ -299,6 +299,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_5vect_dot_prod_sse, 00,  05,  0065
diff --git a/erasure_code/gf_5vect_mad_avx.asm b/erasure_code/gf_5vect_mad_avx.asm
index e9e246c..40ceb76 100644
--- a/erasure_code/gf_5vect_mad_avx.asm
+++ b/erasure_code/gf_5vect_mad_avx.asm
@@ -360,6 +360,3 @@ align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_5vect_mad_avx, 02,  01,  020d
diff --git a/erasure_code/gf_5vect_mad_avx2.asm b/erasure_code/gf_5vect_mad_avx2.asm
index 87038a7..528b7a4 100644
--- a/erasure_code/gf_5vect_mad_avx2.asm
+++ b/erasure_code/gf_5vect_mad_avx2.asm
@@ -358,6 +358,3 @@ align 32
 constip32:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
 	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7
-
-;;;       func             core, ver, snum
-slversion gf_5vect_mad_avx2, 04,  01,  020e
diff --git a/erasure_code/gf_5vect_mad_sse.asm b/erasure_code/gf_5vect_mad_sse.asm
index 17760d0..ec21e26 100644
--- a/erasure_code/gf_5vect_mad_sse.asm
+++ b/erasure_code/gf_5vect_mad_sse.asm
@@ -368,6 +368,3 @@ mask0f:
 	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_5vect_mad_sse, 00,  01,  020c
diff --git a/erasure_code/gf_6vect_dot_prod_avx.asm b/erasure_code/gf_6vect_dot_prod_avx.asm
index 7604711..3bebd9c 100644
--- a/erasure_code/gf_6vect_dot_prod_avx.asm
+++ b/erasure_code/gf_6vect_dot_prod_avx.asm
@@ -310,6 +310,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_6vect_dot_prod_avx, 02,  04,  0195
diff --git a/erasure_code/gf_6vect_dot_prod_avx2.asm b/erasure_code/gf_6vect_dot_prod_avx2.asm
index 5885d97..43118d6 100644
--- a/erasure_code/gf_6vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_6vect_dot_prod_avx2.asm
@@ -319,8 +319,3 @@ func(gf_6vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                   core, ver, snum
-slversion gf_6vect_dot_prod_avx2, 04,  04,  019a
diff --git a/erasure_code/gf_6vect_dot_prod_sse.asm b/erasure_code/gf_6vect_dot_prod_sse.asm
index 41176bb..59bd6b1 100644
--- a/erasure_code/gf_6vect_dot_prod_sse.asm
+++ b/erasure_code/gf_6vect_dot_prod_sse.asm
@@ -310,6 +310,3 @@ section .data
 
 align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                  core, ver, snum
-slversion gf_6vect_dot_prod_sse, 00,  05,  0066
diff --git a/erasure_code/gf_6vect_mad_avx.asm b/erasure_code/gf_6vect_mad_avx.asm
index c9ce490..ed3e12b 100644
--- a/erasure_code/gf_6vect_mad_avx.asm
+++ b/erasure_code/gf_6vect_mad_avx.asm
@@ -389,6 +389,3 @@ align 16
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_6vect_mad_avx, 02,  01,  0210
diff --git a/erasure_code/gf_6vect_mad_avx2.asm b/erasure_code/gf_6vect_mad_avx2.asm
index 8f94c6a..72cbffa 100644
--- a/erasure_code/gf_6vect_mad_avx2.asm
+++ b/erasure_code/gf_6vect_mad_avx2.asm
@@ -395,6 +395,3 @@ align 32
 constip32:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
 	dq 0xe8e9eaebecedeeef, 0xe0e1e2e3e4e5e6e7
-
-;;;       func              core, ver, snum
-slversion gf_6vect_mad_avx2, 04,  01,  0211
diff --git a/erasure_code/gf_6vect_mad_sse.asm b/erasure_code/gf_6vect_mad_sse.asm
index f33ec06..cd7c08c 100644
--- a/erasure_code/gf_6vect_mad_sse.asm
+++ b/erasure_code/gf_6vect_mad_sse.asm
@@ -401,6 +401,3 @@ align 16
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
 constip16:
 	dq 0xf8f9fafbfcfdfeff, 0xf0f1f2f3f4f5f6f7
-
-;;;       func             core, ver, snum
-slversion gf_6vect_mad_sse, 00,  01,  020f
diff --git a/erasure_code/gf_vect_dot_prod_avx.asm b/erasure_code/gf_vect_dot_prod_avx.asm
index 7bd8700..b473122 100644
--- a/erasure_code/gf_vect_dot_prod_avx.asm
+++ b/erasure_code/gf_vect_dot_prod_avx.asm
@@ -266,6 +266,3 @@ align 16
 
 mask0f:
 dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                 core, ver, snum
-slversion gf_vect_dot_prod_avx, 02,  05,  0061
diff --git a/erasure_code/gf_vect_dot_prod_avx2.asm b/erasure_code/gf_vect_dot_prod_avx2.asm
index c385e3b..76595fc 100644
--- a/erasure_code/gf_vect_dot_prod_avx2.asm
+++ b/erasure_code/gf_vect_dot_prod_avx2.asm
@@ -273,8 +273,3 @@ func(gf_vect_dot_prod_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func                  core, ver, snum
-slversion gf_vect_dot_prod_avx2, 04,  05,  0190
diff --git a/erasure_code/gf_vect_dot_prod_sse.asm b/erasure_code/gf_vect_dot_prod_sse.asm
index 9b0a440..4a3bef6 100644
--- a/erasure_code/gf_vect_dot_prod_sse.asm
+++ b/erasure_code/gf_vect_dot_prod_sse.asm
@@ -266,6 +266,3 @@ section .data
 align 16
 
 mask0f:	dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func                 core, ver, snum
-slversion gf_vect_dot_prod_sse, 00,  05,  0060
diff --git a/erasure_code/gf_vect_mad_avx.asm b/erasure_code/gf_vect_mad_avx.asm
index 448fbd7..a788ee7 100644
--- a/erasure_code/gf_vect_mad_avx.asm
+++ b/erasure_code/gf_vect_mad_avx.asm
@@ -191,6 +191,3 @@ section .data
 align 16
 
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func            core, ver, snum
-slversion gf_vect_mad_avx, 02,  01,  0201
diff --git a/erasure_code/gf_vect_mad_avx2.asm b/erasure_code/gf_vect_mad_avx2.asm
index 097d8fa..bf5b567 100644
--- a/erasure_code/gf_vect_mad_avx2.asm
+++ b/erasure_code/gf_vect_mad_avx2.asm
@@ -196,8 +196,3 @@ func(gf_vect_mad_avx2)
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func             core, ver, snum
-slversion gf_vect_mad_avx2, 04,  01,  0202
diff --git a/erasure_code/gf_vect_mad_sse.asm b/erasure_code/gf_vect_mad_sse.asm
index 1044404..2ea4767 100644
--- a/erasure_code/gf_vect_mad_sse.asm
+++ b/erasure_code/gf_vect_mad_sse.asm
@@ -192,6 +192,3 @@ section .data
 align 16
 
 mask0f: dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func            core, ver, snum
-slversion gf_vect_mad_sse, 00,  01,  0200
diff --git a/erasure_code/gf_vect_mul_avx.asm b/erasure_code/gf_vect_mul_avx.asm
index 91f6d6d..f4ce28e 100644
--- a/erasure_code/gf_vect_mul_avx.asm
+++ b/erasure_code/gf_vect_mul_avx.asm
@@ -159,6 +159,3 @@ align 16
 
 mask0f:
 dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func             core, ver, snum
-slversion gf_vect_mul_avx, 01,   03,  0036
diff --git a/erasure_code/gf_vect_mul_sse.asm b/erasure_code/gf_vect_mul_sse.asm
index fefe7ef..242d85b 100644
--- a/erasure_code/gf_vect_mul_sse.asm
+++ b/erasure_code/gf_vect_mul_sse.asm
@@ -165,6 +165,3 @@ section .data
 align 16
 mask0f:
 dq 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-
-;;;       func        core, ver, snum
-slversion gf_vect_mul_sse, 00,   03,  0034
diff --git a/igzip/huff_codes.c b/igzip/huff_codes.c
index 11caed4..f544f87 100644
--- a/igzip/huff_codes.c
+++ b/igzip/huff_codes.c
@@ -599,22 +599,6 @@ static struct hufftables_icf static_hufftables = {
 		       {{{.code_and_extra = 0x000,.length2 = 0x0}}}}
 };
 
-struct slver {
-	uint16_t snum;
-	uint8_t ver;
-	uint8_t core;
-};
-
-/* Version info */
-struct slver isal_update_histogram_slver_00010085;
-struct slver isal_update_histogram_slver = { 0x0085, 0x01, 0x00 };
-
-struct slver isal_create_hufftables_slver_00010086;
-struct slver isal_create_hufftables_slver = { 0x0086, 0x01, 0x00 };
-
-struct slver isal_create_hufftables_subset_slver_00010087;
-struct slver isal_create_hufftables_subset_slver = { 0x0087, 0x01, 0x00 };
-
 extern uint32_t build_huff_tree(struct heap_tree *heap, uint64_t heap_size, uint64_t node_ptr);
 extern void build_heap(uint64_t * heap, uint64_t heap_size);
 
diff --git a/igzip/igzip.c b/igzip/igzip.c
index dcaba0c..1a2e844 100644
--- a/igzip/igzip.c
+++ b/igzip/igzip.c
@@ -94,34 +94,6 @@ static void write_header(struct isal_zstream *stream, uint8_t * deflate_hdr,
 			 uint32_t next_state, uint32_t toggle_end_of_stream);
 static void write_trailer(struct isal_zstream *stream);
 
-struct slver {
-	uint16_t snum;
-	uint8_t ver;
-	uint8_t core;
-};
-
-/* Version info */
-struct slver isal_deflate_init_slver_01030081;
-struct slver isal_deflate_init_slver = { 0x0081, 0x03, 0x01 };
-
-struct slver isal_deflate_reset_slver_0001008e;
-struct slver isal_deflate_reset_slver = { 0x008e, 0x01, 0x00 };
-
-struct slver isal_deflate_stateless_init_slver_00010084;
-struct slver isal_deflate_stateless_init_slver = { 0x0084, 0x01, 0x00 };
-
-struct slver isal_deflate_slver_01030082;
-struct slver isal_deflate_slver = { 0x0082, 0x03, 0x01 };
-
-struct slver isal_deflate_stateless_slver_01010083;
-struct slver isal_deflate_stateless_slver = { 0x0083, 0x01, 0x01 };
-
-struct slver isal_deflate_set_hufftables_slver_0001008b;
-struct slver isal_deflate_set_hufftables_slver = { 0x008b, 0x01, 0x00 };
-
-struct slver isal_deflate_set_dict_slver_0001008c;
-struct slver isal_deflate_set_dict_slver = { 0x008c, 0x01, 0x00 };
-
 /*****************************************************************/
 
 // isal_adler32_bam1 - adler with (B | A minus 1) storage
diff --git a/igzip/igzip_inflate.c b/igzip/igzip_inflate.c
index 37649cd..a14efe2 100644
--- a/igzip/igzip_inflate.c
+++ b/igzip/igzip_inflate.c
@@ -126,28 +126,6 @@ static struct rfc1951_tables rfc_lookup_table = {
 		      0x0083, 0x00a3, 0x00c3, 0x00e3, 0x0102, 0x0103, 0x0000, 0x0000}
 };
 
-struct slver {
-	uint16_t snum;
-	uint8_t ver;
-	uint8_t core;
-};
-
-/* Version info */
-struct slver isal_inflate_init_slver_00010088;
-struct slver isal_inflate_init_slver = { 0x0088, 0x01, 0x00 };
-
-struct slver isal_inflate_reset_slver_0001008f;
-struct slver isal_inflate_reset_slver = { 0x008f, 0x01, 0x00 };
-
-struct slver isal_inflate_stateless_slver_00010089;
-struct slver isal_inflate_stateless_slver = { 0x0089, 0x01, 0x00 };
-
-struct slver isal_inflate_slver_0001008a;
-struct slver isal_inflate_slver = { 0x008a, 0x01, 0x00 };
-
-struct slver isal_inflate_set_dict_slver_0001008d;
-struct slver isal_inflate_set_dict_slver = { 0x008d, 0x01, 0x00 };
-
 /*Performs a copy of length repeat_length data starting at dest -
  * lookback_distance into dest. This copy copies data previously copied when the
  * src buffer and the dest buffer overlap. */
diff --git a/include/reg_sizes.asm b/include/reg_sizes.asm
index 989ae2c..839b912 100644
--- a/include/reg_sizes.asm
+++ b/include/reg_sizes.asm
@@ -294,15 +294,4 @@ section .text
  %define elf64 macho64
  mac_equ equ 1
 %endif
-
-%macro slversion 4
-	section .text
-	global %1_slver_%2%3%4
-	global %1_slver
-	%1_slver:
-	%1_slver_%2%3%4:
-		dw 0x%4
-		db 0x%3, 0x%2
-%endmacro
-
 %endif ; ifndef _REG_SIZES_ASM_
diff --git a/raid/pq_check_sse.asm b/raid/pq_check_sse.asm
index f2bc8a6..42ec5a2 100644
--- a/raid/pq_check_sse.asm
+++ b/raid/pq_check_sse.asm
@@ -272,6 +272,3 @@ section .data
 align 16
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func          core, ver, snum
-slversion pq_check_sse, 00,   06,  0033
diff --git a/raid/pq_check_sse_i32.asm b/raid/pq_check_sse_i32.asm
index 3271c03..25ad59b 100644
--- a/raid/pq_check_sse_i32.asm
+++ b/raid/pq_check_sse_i32.asm
@@ -277,6 +277,3 @@ section .data
 align 16
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func          core, ver, snum
-slversion pq_check_sse, 00,   06,  0033
diff --git a/raid/pq_gen_avx.asm b/raid/pq_gen_avx.asm
index db4bcfb..3a1da03 100644
--- a/raid/pq_gen_avx.asm
+++ b/raid/pq_gen_avx.asm
@@ -249,6 +249,3 @@ section .data
 align 16
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func        core, ver, snum
-slversion pq_gen_avx, 02,   0a,  0039
diff --git a/raid/pq_gen_avx2.asm b/raid/pq_gen_avx2.asm
index a0bf0cc..3d51fc4 100644
--- a/raid/pq_gen_avx2.asm
+++ b/raid/pq_gen_avx2.asm
@@ -251,6 +251,3 @@ align 32
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func        core,  ver, snum
-slversion pq_gen_avx2, 04,   03,  0041
diff --git a/raid/pq_gen_sse.asm b/raid/pq_gen_sse.asm
index b6d5148..d4f11de 100644
--- a/raid/pq_gen_sse.asm
+++ b/raid/pq_gen_sse.asm
@@ -253,6 +253,3 @@ section .data
 align 16
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func        core, ver, snum
-slversion pq_gen_sse, 00,   09,  0032
diff --git a/raid/pq_gen_sse_i32.asm b/raid/pq_gen_sse_i32.asm
index 8dabb78..708e307 100644
--- a/raid/pq_gen_sse_i32.asm
+++ b/raid/pq_gen_sse_i32.asm
@@ -259,6 +259,3 @@ section .data
 align 16
 poly:
 dq 0x1d1d1d1d1d1d1d1d, 0x1d1d1d1d1d1d1d1d
-
-;;;       func        core, ver, snum
-slversion pq_gen_sse, 00,   08,  0032
diff --git a/raid/raid_base.c b/raid/raid_base.c
index 507bb6f..62bdca7 100644
--- a/raid/raid_base.c
+++ b/raid/raid_base.c
@@ -139,21 +139,3 @@ int xor_check_base(int vects, int len, void **array)
 		return len;
 	return fail;
 }
-
-struct slver {
-	unsigned short snum;
-	unsigned char ver;
-	unsigned char core;
-};
-
-struct slver pq_gen_base_slver_0001012a;
-struct slver pq_gen_base_slver = { 0x012a, 0x01, 0x00 };
-
-struct slver xor_gen_base_slver_0001012b;
-struct slver xor_gen_base_slver = { 0x012b, 0x01, 0x00 };
-
-struct slver pq_check_base_slver_0001012c;
-struct slver pq_check_base_slver = { 0x012c, 0x01, 0x00 };
-
-struct slver xor_check_base_slver_0001012d;
-struct slver xor_check_base_slver = { 0x012d, 0x01, 0x00 };
diff --git a/raid/raid_multibinary.asm b/raid/raid_multibinary.asm
index 47ef1e3..c7a7dc5 100644
--- a/raid/raid_multibinary.asm
+++ b/raid/raid_multibinary.asm
@@ -135,9 +135,3 @@ xor_check_dispatch_init:
 	pop     rbx
 	pop     rax
 	ret
-
-;;;       func          	core, ver, snum
-slversion xor_gen,		00,   03,  0126
-slversion xor_check,		00,   03,  0127
-slversion pq_gen,		00,   03,  0128
-slversion pq_check,		00,   03,  0129
diff --git a/raid/xor_check_sse.asm b/raid/xor_check_sse.asm
index a5fe0b2..dd0f6e9 100644
--- a/raid/xor_check_sse.asm
+++ b/raid/xor_check_sse.asm
@@ -277,9 +277,3 @@ return_fail:
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func           core, ver, snum
-slversion xor_check_sse, 00,   03,  0031
-
diff --git a/raid/xor_gen_avx.asm b/raid/xor_gen_avx.asm
index b5527b2..436840f 100644
--- a/raid/xor_gen_avx.asm
+++ b/raid/xor_gen_avx.asm
@@ -220,9 +220,3 @@ return_fail:
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func         core, ver, snum
-slversion xor_gen_avx, 02,   05,  0037
-
diff --git a/raid/xor_gen_sse.asm b/raid/xor_gen_sse.asm
index f31ae63..95efd67 100644
--- a/raid/xor_gen_sse.asm
+++ b/raid/xor_gen_sse.asm
@@ -276,9 +276,3 @@ return_fail:
 	ret
 
 endproc_frame
-
-section .data
-
-;;;       func         core, ver, snum
-slversion xor_gen_sse, 00,   0c,  0030
-