diff --git a/tests/handover/neighbor_ident_test.c b/tests/handover/neighbor_ident_test.c
index b67219c..4eddd4a 100644
--- a/tests/handover/neighbor_ident_test.c
+++ b/tests/handover/neighbor_ident_test.c
@@ -30,13 +30,12 @@
 
 struct neighbor_ident_list *nil;
 
-static const struct neighbor_ident_key *k(int from_bts, uint16_t arfcn, enum bsic_kind kind, uint16_t bsic)
+static const struct neighbor_ident_key *k(int from_bts, uint16_t arfcn, uint8_t bsic)
 {
 	static struct neighbor_ident_key key;
 	key = (struct neighbor_ident_key){
 		.from_bts = from_bts,
 		.arfcn = arfcn,
-		.bsic_kind = kind,
 		.bsic = bsic,
 	};
 	return &key;
@@ -187,61 +186,54 @@
 
 	printf("\n--- testing NULL neighbor_ident_list\n");
 	nil = NULL;
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi1, -ENOMEM);
-	check_get(k(0, 1, BSIC_6BIT, 2), false);
-	check_del(k(0, 1, BSIC_6BIT, 2), false);
+	check_add(k(0, 1, 2), &cgi1, -ENOMEM);
+	check_get(k(0, 1, 2), false);
+	check_del(k(0, 1, 2), false);
 
 	printf("\n--- adding entries, test that no two identical entries are added\n");
 	nil = neighbor_ident_init(ctx);
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi1, 1);
-	check_get(k(0, 1, BSIC_6BIT, 2), true);
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi1, 1);
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi2, 2);
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi2, 2);
-	check_del(k(0, 1, BSIC_6BIT, 2), true);
+	check_add(k(0, 1, 2), &cgi1, 1);
+	check_get(k(0, 1, 2), true);
+	check_add(k(0, 1, 2), &cgi1, 1);
+	check_add(k(0, 1, 2), &cgi2, 2);
+	check_add(k(0, 1, 2), &cgi2, 2);
+	check_del(k(0, 1, 2), true);
 
 	printf("\n--- Cannot mix cell identifier types for one entry\n");
-	check_add(k(0, 1, BSIC_6BIT, 2), &cgi1, 1);
-	check_add(k(0, 1, BSIC_6BIT, 2), &lac1, -EINVAL);
-	check_del(k(0, 1, BSIC_6BIT, 2), true);
+	check_add(k(0, 1, 2), &cgi1, 1);
+	check_add(k(0, 1, 2), &lac1, -EINVAL);
+	check_del(k(0, 1, 2), true);
 	neighbor_ident_free(nil);
 
 	printf("\n--- BTS matching: specific BTS is stronger\n");
 	nil = neighbor_ident_init(ctx);
-	check_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, BSIC_6BIT, 2), &lac1, 1);
-	check_add(k(3, 1, BSIC_6BIT, 2), &lac2, 2);
-	check_get(k(2, 1, BSIC_6BIT, 2), true);
-	check_get(k(3, 1, BSIC_6BIT, 2), true);
-	check_get(k(4, 1, BSIC_6BIT, 2), true);
-	check_get(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, BSIC_6BIT, 2), true);
+	check_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, 2), &lac1, 1);
+	check_add(k(3, 1, 2), &lac2, 2);
+	check_get(k(2, 1, 2), true);
+	check_get(k(3, 1, 2), true);
+	check_get(k(4, 1, 2), true);
+	check_get(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, 2), true);
 	neighbor_ident_free(nil);
 
 	printf("\n--- BSIC matching: 6bit and 9bit are different realms, and wildcard match is weaker\n");
 	nil = neighbor_ident_init(ctx);
-	check_add(k(0, 1, BSIC_NONE, 0), &cgi1, 1);
-	check_add(k(0, 1, BSIC_6BIT, 2), &lac1, 1);
-	check_add(k(0, 1, BSIC_9BIT, 2), &lac2, 2);
-	check_get(k(0, 1, BSIC_6BIT, 2), true);
-	check_get(k(0, 1, BSIC_9BIT, 2), true);
-	printf("--- wildcard matches both 6bit and 9bit BSIC regardless:\n");
-	check_get(k(0, 1, BSIC_6BIT, 23), true);
-	check_get(k(0, 1, BSIC_9BIT, 23), true);
+	check_add(k(0, 1, BSIC_ANY), &cgi1, 1);
+	check_add(k(0, 1, 2), &lac1, 1);
+	check_add(k(0, 1, 2), &lac2, 2);
+	check_get(k(0, 1, 2), true);
+	check_get(k(0, 1, 2), true);
 	neighbor_ident_free(nil);
 
 	printf("\n--- Value ranges\n");
 	nil = neighbor_ident_init(ctx);
-	check_add(k(0, 6, BSIC_6BIT, 1 << 6), &lac1, -ERANGE);
-	check_add(k(0, 9, BSIC_9BIT, 1 << 9), &lac1, -ERANGE);
-	check_add(k(0, 6, BSIC_6BIT, -1), &lac1, -ERANGE);
-	check_add(k(0, 9, BSIC_9BIT, -1), &lac1, -ERANGE);
-	check_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS - 1, 1, BSIC_NONE, 1), &cgi2, -ERANGE);
-	check_add(k(256, 1, BSIC_NONE, 1), &cgi2, -ERANGE);
-	check_add(k(0, 0, BSIC_NONE, 0), &cgi1, 1);
-	check_add(k(255, 65535, BSIC_NONE, 65535), &lac1, 1);
-	check_add(k(0, 0, BSIC_6BIT, 0), &cgi2, 2);
-	check_add(k(255, 65535, BSIC_6BIT, 0x3f), &lac2, 2);
-	check_add(k(0, 0, BSIC_9BIT, 0), &cgi1, 1);
-	check_add(k(255, 65535, BSIC_9BIT, 0x1ff), &cgi2, 2);
+	check_add(k(0, 6, 1 << 6), &lac1, -ERANGE);
+	check_add(k(0, 6, BSIC_ANY - 1), &lac1, -ERANGE);
+	check_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS - 1, 1, BSIC_ANY), &cgi2, -ERANGE);
+	check_add(k(256, 1, BSIC_ANY), &cgi2, -ERANGE);
+	check_add(k(0, 0, BSIC_ANY), &cgi1, 1);
+	check_add(k(255, 65535, BSIC_ANY), &lac1, 1);
+	check_add(k(0, 0, 0), &cgi2, 2);
+	check_add(k(255, 65535, 0x3f), &lac2, 2);
 
 	neighbor_ident_free(nil);
 
@@ -262,9 +254,9 @@
 
 		nil = neighbor_ident_init(ctx);
 
-		i = neighbor_ident_add(nil, k(0, 1, BSIC_6BIT, 2), &a);
+		i = neighbor_ident_add(nil, k(0, 1, 2), &a);
 		printf("Added first cell identifier list (added %u) --> rc = %d\n", a.id_list_len, i);
-		i = neighbor_ident_add(nil, k(0, 1, BSIC_6BIT, 2), &b);
+		i = neighbor_ident_add(nil, k(0, 1, 2), &b);
 		printf("Added second cell identifier list (tried to add %u) --> rc = %d\n", b.id_list_len, i);
 		if (i != -ENOSPC)
 			printf("ERROR: expected rc=%d\n", -ENOSPC);
diff --git a/tests/handover/neighbor_ident_test.ok b/tests/handover/neighbor_ident_test.ok
index 280b6f2..961a33c 100644
--- a/tests/handover/neighbor_ident_test.ok
+++ b/tests/handover/neighbor_ident_test.ok
@@ -1,62 +1,62 @@
 
 --- testing NULL neighbor_ident_list
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi1) --> expect rc=-ENOMEM, got -12
+neighbor_ident_add(k(0, 1, 2), &cgi1) --> expect rc=-ENOMEM, got -12
      (empty)
-neighbor_ident_get(k(0, 1, BSIC_6BIT, 2)) --> NULL
-neighbor_ident_del(k(0, 1, BSIC_6BIT, 2)) --> nothing deleted
+neighbor_ident_get(k(0, 1, 2)) --> NULL
+neighbor_ident_del(k(0, 1, 2)) --> nothing deleted
      (empty)
 
 --- adding entries, test that no two identical entries are added
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 1, 2), &cgi1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_get(k(0, 1, BSIC_6BIT, 2)) --> entry returned
+neighbor_ident_get(k(0, 1, 2)) --> entry returned
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 1, 2), &cgi1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi2) --> expect rc=2, got 2
+neighbor_ident_add(k(0, 1, 2), &cgi2) --> expect rc=2, got 2
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[2] = {
         0: 001-02-3-4
         1: 005-006-7-8
      }
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi2) --> expect rc=2, got 2
+neighbor_ident_add(k(0, 1, 2), &cgi2) --> expect rc=2, got 2
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[2] = {
         0: 001-02-3-4
         1: 005-006-7-8
      }
-neighbor_ident_del(k(0, 1, BSIC_6BIT, 2)) --> entry deleted
+neighbor_ident_del(k(0, 1, 2)) --> entry deleted
      (empty)
 
 --- Cannot mix cell identifier types for one entry
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &cgi1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 1, 2), &cgi1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &lac1) --> expect rc=-EINVAL, got -22
+neighbor_ident_add(k(0, 1, 2), &lac1) --> expect rc=-EINVAL, got -22
   0: BTS 0 to ARFCN 1 BSIC 2
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_del(k(0, 1, BSIC_6BIT, 2)) --> entry deleted
+neighbor_ident_del(k(0, 1, 2)) --> entry deleted
      (empty)
 
 --- BTS matching: specific BTS is stronger
-neighbor_ident_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, BSIC_6BIT, 2), &lac1) --> expect rc=1, got 1
+neighbor_ident_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, 2), &lac1) --> expect rc=1, got 1
   0: BTS * to ARFCN 1 BSIC 2
      cell_id_list lac[1] = {
        0: 123
      }
-neighbor_ident_add(k(3, 1, BSIC_6BIT, 2), &lac2) --> expect rc=2, got 2
+neighbor_ident_add(k(3, 1, 2), &lac2) --> expect rc=2, got 2
   0: BTS * to ARFCN 1 BSIC 2
      cell_id_list lac[1] = {
        0: 123
@@ -66,31 +66,31 @@
        0: 456
        1: 789
      }
-neighbor_ident_get(k(2, 1, BSIC_6BIT, 2)) --> entry returned
+neighbor_ident_get(k(2, 1, 2)) --> entry returned
      cell_id_list lac[1] = {
        0: 123
      }
-neighbor_ident_get(k(3, 1, BSIC_6BIT, 2)) --> entry returned
+neighbor_ident_get(k(3, 1, 2)) --> entry returned
      cell_id_list lac[2] = {
        0: 456
        1: 789
      }
-neighbor_ident_get(k(4, 1, BSIC_6BIT, 2)) --> entry returned
+neighbor_ident_get(k(4, 1, 2)) --> entry returned
      cell_id_list lac[1] = {
        0: 123
      }
-neighbor_ident_get(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, BSIC_6BIT, 2)) --> entry returned
+neighbor_ident_get(k(NEIGHBOR_IDENT_KEY_ANY_BTS, 1, 2)) --> entry returned
      cell_id_list lac[1] = {
        0: 123
      }
 
 --- BSIC matching: 6bit and 9bit are different realms, and wildcard match is weaker
-neighbor_ident_add(k(0, 1, BSIC_NONE, 0), &cgi1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 1, BSIC_ANY), &cgi1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 1 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_add(k(0, 1, BSIC_6BIT, 2), &lac1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 1, 2), &lac1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 1 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
@@ -99,58 +99,46 @@
      cell_id_list lac[1] = {
        0: 123
      }
-neighbor_ident_add(k(0, 1, BSIC_9BIT, 2), &lac2) --> expect rc=2, got 2
+neighbor_ident_add(k(0, 1, 2), &lac2) --> expect rc=2, got 3
+ERROR
   0: BTS 0 to ARFCN 1 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
   1: BTS 0 to ARFCN 1 BSIC 2
-     cell_id_list lac[1] = {
+     cell_id_list lac[3] = {
        0: 123
+       1: 456
+       2: 789
      }
-  2: BTS 0 to ARFCN 1 BSIC 2(9bit)
-     cell_id_list lac[2] = {
-       0: 456
-       1: 789
-     }
-neighbor_ident_get(k(0, 1, BSIC_6BIT, 2)) --> entry returned
-     cell_id_list lac[1] = {
+neighbor_ident_get(k(0, 1, 2)) --> entry returned
+     cell_id_list lac[3] = {
        0: 123
+       1: 456
+       2: 789
      }
-neighbor_ident_get(k(0, 1, BSIC_9BIT, 2)) --> entry returned
-     cell_id_list lac[2] = {
-       0: 456
-       1: 789
-     }
---- wildcard matches both 6bit and 9bit BSIC regardless:
-neighbor_ident_get(k(0, 1, BSIC_6BIT, 23)) --> entry returned
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
-     }
-neighbor_ident_get(k(0, 1, BSIC_9BIT, 23)) --> entry returned
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
+neighbor_ident_get(k(0, 1, 2)) --> entry returned
+     cell_id_list lac[3] = {
+       0: 123
+       1: 456
+       2: 789
      }
 
 --- Value ranges
-neighbor_ident_add(k(0, 6, BSIC_6BIT, 1 << 6), &lac1) --> expect rc=-ERANGE, got -34
+neighbor_ident_add(k(0, 6, 1 << 6), &lac1) --> expect rc=-ERANGE, got -34
      (empty)
-neighbor_ident_add(k(0, 9, BSIC_9BIT, 1 << 9), &lac1) --> expect rc=-ERANGE, got -34
+neighbor_ident_add(k(0, 6, BSIC_ANY - 1), &lac1) --> expect rc=-ERANGE, got -34
      (empty)
-neighbor_ident_add(k(0, 6, BSIC_6BIT, -1), &lac1) --> expect rc=-ERANGE, got -34
+neighbor_ident_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS - 1, 1, BSIC_ANY), &cgi2) --> expect rc=-ERANGE, got -34
      (empty)
-neighbor_ident_add(k(0, 9, BSIC_9BIT, -1), &lac1) --> expect rc=-ERANGE, got -34
+neighbor_ident_add(k(256, 1, BSIC_ANY), &cgi2) --> expect rc=-ERANGE, got -34
      (empty)
-neighbor_ident_add(k(NEIGHBOR_IDENT_KEY_ANY_BTS - 1, 1, BSIC_NONE, 1), &cgi2) --> expect rc=-ERANGE, got -34
-     (empty)
-neighbor_ident_add(k(256, 1, BSIC_NONE, 1), &cgi2) --> expect rc=-ERANGE, got -34
-     (empty)
-neighbor_ident_add(k(0, 0, BSIC_NONE, 0), &cgi1) --> expect rc=1, got 1
+neighbor_ident_add(k(0, 0, BSIC_ANY), &cgi1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 0 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
      }
-neighbor_ident_add(k(255, 65535, BSIC_NONE, 65535), &lac1) --> expect rc=1, got 1
+neighbor_ident_add(k(255, 65535, BSIC_ANY), &lac1) --> expect rc=1, got 1
   0: BTS 0 to ARFCN 0 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
@@ -159,7 +147,7 @@
      cell_id_list lac[1] = {
        0: 123
      }
-neighbor_ident_add(k(0, 0, BSIC_6BIT, 0), &cgi2) --> expect rc=2, got 2
+neighbor_ident_add(k(0, 0, 0), &cgi2) --> expect rc=2, got 2
   0: BTS 0 to ARFCN 0 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
@@ -173,7 +161,7 @@
         0: 001-02-3-4
         1: 005-006-7-8
      }
-neighbor_ident_add(k(255, 65535, BSIC_6BIT, 0x3f), &lac2) --> expect rc=2, got 2
+neighbor_ident_add(k(255, 65535, 0x3f), &lac2) --> expect rc=2, got 2
   0: BTS 0 to ARFCN 0 (any BSIC)
      cell_id_list cgi[1] = {
         0: 001-02-3-4
@@ -192,57 +180,6 @@
        0: 456
        1: 789
      }
-neighbor_ident_add(k(0, 0, BSIC_9BIT, 0), &cgi1) --> expect rc=1, got 1
-  0: BTS 0 to ARFCN 0 (any BSIC)
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
-     }
-  1: BTS 255 to ARFCN 65535 (any BSIC)
-     cell_id_list lac[1] = {
-       0: 123
-     }
-  2: BTS 0 to ARFCN 0 BSIC 0
-     cell_id_list cgi[2] = {
-        0: 001-02-3-4
-        1: 005-006-7-8
-     }
-  3: BTS 255 to ARFCN 65535 BSIC 63
-     cell_id_list lac[2] = {
-       0: 456
-       1: 789
-     }
-  4: BTS 0 to ARFCN 0 BSIC 0(9bit)
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
-     }
-neighbor_ident_add(k(255, 65535, BSIC_9BIT, 0x1ff), &cgi2) --> expect rc=2, got 2
-  0: BTS 0 to ARFCN 0 (any BSIC)
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
-     }
-  1: BTS 255 to ARFCN 65535 (any BSIC)
-     cell_id_list lac[1] = {
-       0: 123
-     }
-  2: BTS 0 to ARFCN 0 BSIC 0
-     cell_id_list cgi[2] = {
-        0: 001-02-3-4
-        1: 005-006-7-8
-     }
-  3: BTS 255 to ARFCN 65535 BSIC 63
-     cell_id_list lac[2] = {
-       0: 456
-       1: 789
-     }
-  4: BTS 0 to ARFCN 0 BSIC 0(9bit)
-     cell_id_list cgi[1] = {
-        0: 001-02-3-4
-     }
-  5: BTS 255 to ARFCN 65535 BSIC 511(9bit)
-     cell_id_list cgi[2] = {
-        0: 001-02-3-4
-        1: 005-006-7-8
-     }
 
 --- size limits
 Added first cell identifier list (added 127) --> rc = 127
diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty
index 11227ed..692d894 100644
--- a/tests/neighbor_ident.vty
+++ b/tests/neighbor_ident.vty
@@ -2,13 +2,13 @@
 
 OsmoBSC> list
 ...
-  show bts <0-255> neighbor arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
+  show bts <0-255> neighbor arfcn <0-1023> bsic (<0-63>|any)
 ...
 
 OsmoBSC> enable
 OsmoBSC# list
 ...
-  show bts <0-255> neighbor arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
+  show bts <0-255> neighbor arfcn <0-1023> bsic (<0-63>|any)
 ...
 
 OsmoBSC# configure terminal
@@ -83,18 +83,18 @@
   neighbor add bts <0-255>
   neighbor add lac <0-65535>
   neighbor add lac-ci <0-65535> <0-255>
-  neighbor add lac <0-65535> arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
-  neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
-  neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
+  neighbor add lac <0-65535> arfcn <0-1023> bsic (<0-63>|any)
+  neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)
+  neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)
   neighbor del bts <0-255>
-  neighbor del arfcn <0-1023> (bsic|bsic9) (<0-511>|any)
+  neighbor del arfcn <0-1023> bsic (<0-63>|any)
 ...
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add
 
 OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 64
-% Error: BSIC value surpasses 6-bit range: 64, use 'bsic9' instead
+% Unknown command.
 
 OsmoBSC(config-net-bts)# neighbor add bts 0
 % Error: cannot add local BTS 0 as neighbor to BTS 0: Invalid argument
@@ -135,11 +135,8 @@
 OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic any
 % BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry
 
-OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic9 511
-% BTS 0 to ARFCN 423 BSIC 511(9bit) now has 1 remote BSS Cell Identifier List entry
-
-OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic9 1
-% BTS 0 to ARFCN 423 BSIC 1(9bit) now has 1 remote BSS Cell Identifier List entry
+OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 63
+% BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry
 
 OsmoBSC(config-net-bts)# neighbor add lac-ci 789 10 arfcn 423 bsic 1
 % BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry
@@ -157,8 +154,7 @@
   neighbor add cgi 023 042 234 56 arfcn 23 bsic 42
   neighbor add lac 456 arfcn 123 bsic 45
   neighbor add lac-ci 789 10 arfcn 423 bsic any
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 511
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 1
+  neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
 
@@ -186,8 +182,7 @@
   neighbor add lac-ci 22 32
   neighbor add lac 456 arfcn 123 bsic 45
   neighbor add lac-ci 789 10 arfcn 423 bsic any
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 511
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 1
+  neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
 
@@ -199,8 +194,7 @@
   neighbor add lac-ci 21 31
   neighbor add lac-ci 22 32
   neighbor add lac-ci 789 10 arfcn 423 bsic any
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 511
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 1
+  neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
 
@@ -211,15 +205,12 @@
 ... !neighbor add
   neighbor add lac-ci 21 31
   neighbor add lac-ci 22 32
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 511
-  neighbor add lac-ci 789 10 arfcn 423 bsic9 1
+  neighbor add lac-ci 789 10 arfcn 423 bsic 63
   neighbor add lac-ci 789 10 arfcn 423 bsic 1
 ... !neighbor add
 
-OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic9 511
-% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 511(9bit)
-OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic9 1
-% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1(9bit)
+OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63
+% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63
 
 OsmoBSC(config-net-bts)# show running-config
 ... !neighbor add