diff --git a/packages/font-otl/src/gsub-thousands.ptl b/packages/font-otl/src/gsub-thousands.ptl
index 9e327f0c3..2f3a49467 100644
--- a/packages/font-otl/src/gsub-thousands.ptl
+++ b/packages/font-otl/src/gsub-thousands.ptl
@@ -1,7 +1,5 @@
 $$include './meta/macros.ptl'
 
-import [QueryRelatedGlyphs] from "./table-util.mjs"
-
 export : define [buildGsubThousands gsub para] : begin
 	local rec : gsub.beginBlock
 
diff --git a/packages/font-otl/src/table-util.ptl b/packages/font-otl/src/table-util.ptl
index 9974baf81..7a9a2c2d9 100644
--- a/packages/font-otl/src/table-util.ptl
+++ b/packages/font-otl/src/table-util.ptl
@@ -1,5 +1,4 @@
 import toposort from 'toposort'
-import [AnyCv] from "@iosevka/glyph/relation"
 
 extern Map
 extern Set
@@ -209,14 +208,6 @@ class LayoutLanguage
 define UtilityLookupPrefix '.utility-single/'
 define [IsUtilityLookupId name] : [name.slice 0 UtilityLookupPrefix.length] === UtilityLookupPrefix
 
-export : define [QueryRelatedGlyphs glyphs para entries] : begin
-	define sink {}
-	foreach [gid : items-of entries] : if glyphs.(gid) : begin
-		sink.push gid
-		if para.enableCvSs : foreach [gr : items-of : AnyCv.query glyphs.(gid)] : begin
-			sink.push : gr.get glyphs.(gid)
-	return sink
-
 export : define [FinalizeTable table] : begin
 	set table.lookupOrder : toposort table.lookupDep
 	foreach [{key lang} : pairs-of table.languages] : begin
diff --git a/packages/font/src/ttfa-controls/index.mjs b/packages/font/src/ttfa-controls/index.mjs
index 7840fd759..0e1255baa 100644
--- a/packages/font/src/ttfa-controls/index.mjs
+++ b/packages/font/src/ttfa-controls/index.mjs
@@ -62,7 +62,7 @@ class Alignment {
 
 			for (const [go, gd] of this.allGlyphs) {
 				const cvs = [
-					...Gr.AnyCv.query(go),
+					...Gr.AnyCvOrCherryPicking.query(go),
 					Gr.Texture.ExtL,
 					Gr.Texture.ExtR,
 					Gr.Texture.ExtLR,