From cb3e90bf3a5161c2dfc297665ac88134cbd88588 Mon Sep 17 00:00:00 2001
From: Sharon Correll <sharon_correll@sil.org>
Date: Tue, 1 Oct 2024 16:35:16 -0400
Subject: [PATCH] Deleted obsolete and superfluous glyphs.

---
 .../AwamiNastaliq-Black.ufo/fontinfo.plist    |   2 +-
 .../glyphs.public.background/contents.plist   |  34 --
 .../ligA_llahlong.alt.glif                    | 559 ------------------
 .../testA_inG_afJ_eemM_eem.draft.glif         | 190 ------
 .../testA_inG_afJ_eemM_eem.glif               | 361 -----------
 .../testA_inK_afB_ehR_eh.glif                 | 123 ----
 .../testA_lefT_ahH_ehgoalF_eh.draft.glif      | 169 ------
 .../testA_lefT_ahH_ehgoalF_eh.glif            | 172 ------
 .../testD_alS_eenB_ariyeh.glif                | 120 ----
 .../testF_ehB_ehA_inR_eh.draft.glif           | 218 -------
 .../testF_ehB_ehA_inR_eh.glif                 | 219 -------
 .../testG_afS_eenH_ehdo.glif                  | 203 -------
 .../testH_ehdoD_alH_ehdoA_inJ_eem.glif        | 212 -------
 .../testH_ehgoalS_adQ_af.glif                 | 152 -----
 .../testJ_eemM_eemaltL_amW_aw.draft.glif      | 196 ------
 .../testJ_eemM_eemaltL_amW_aw.glif            | 196 ------
 .../testK_afS_eenH_ehdo.draft.glif            | 183 ------
 .../testM_eemK_afR_eh.glif                    |  77 ---
 .../testS_adB_ehL_amN_oon.draft.glif          | 193 ------
 .../glyphs/contents.plist                     |  36 --
 .../glyphs/ligA_layhiA_sS_alam.scratch.glif   |  11 -
 .../glyphs/ligA_llahlong.alt.glif             |  11 -
 .../glyphs/testA_inG_afJ_eemM_eem.draft.glif  |  13 -
 .../glyphs/testA_inG_afJ_eemM_eem.glif        |  13 -
 .../glyphs/testA_inK_afB_ehR_eh.glif          |  13 -
 .../testA_lefT_ahH_ehgoalF_eh.draft.glif      |  13 -
 .../glyphs/testA_lefT_ahH_ehgoalF_eh.glif     |  13 -
 .../glyphs/testD_alS_eenB_ariyeh.glif         |  13 -
 .../glyphs/testF_ehB_ehA_inR_eh.draft.glif    |  13 -
 .../glyphs/testF_ehB_ehA_inR_eh.glif          |  13 -
 .../glyphs/testG_afS_eenH_ehdo.glif           |  13 -
 .../glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif |  13 -
 .../glyphs/testH_ehgoalS_adQ_af.glif          |  13 -
 .../testJ_eemM_eemaltL_amW_aw.draft.glif      |  13 -
 .../glyphs/testJ_eemM_eemaltL_amW_aw.glif     |  13 -
 .../glyphs/testK_afS_eenH_ehdo.draft.glif     |  13 -
 .../glyphs/testM_eemK_afR_eh.glif             |  13 -
 .../glyphs/testS_adB_ehL_amN_oon.draft.glif   |  13 -
 .../masters/AwamiNastaliq-Black.ufo/lib.plist |   4 -
 .../AwamiNastaliq-Regular.ufo/fontinfo.plist  |   2 +-
 .../glyphs.public.background/contents.plist   |  32 -
 .../ligA_llahlong.alt.glif                    | 559 ------------------
 .../testA_inG_afJ_eemM_eem.draft.glif         | 190 ------
 .../testA_inG_afJ_eemM_eem.glif               | 378 ------------
 .../testA_inK_afB_ehR_eh.glif                 | 123 ----
 .../testA_lefT_ahH_ehgoalF_eh.draft.glif      | 195 ------
 .../testA_lefT_ahH_ehgoalF_eh.glif            | 172 ------
 .../testD_alS_eenB_ariyeh.glif                | 120 ----
 .../testF_ehB_ehA_inR_eh.draft.glif           | 192 ------
 .../testF_ehB_ehA_inR_eh.glif                 | 219 -------
 .../testH_ehdoD_alH_ehdoA_inJ_eem.glif        | 212 -------
 .../testH_ehgoalS_adQ_af.glif                 | 152 -----
 .../testJ_eemM_eemaltL_amW_aw.draft.glif      | 264 ---------
 .../testJ_eemM_eemaltL_amW_aw.glif            | 260 --------
 .../testK_afS_eenH_ehdo.draft.glif            | 183 ------
 .../testM_eemK_afR_eh.glif                    |  77 ---
 .../testS_adB_ehL_amN_oon.draft.glif          | 193 ------
 .../glyphs/contents.plist                     |  36 --
 .../glyphs/ligA_layhiA_sS_alam.scratch.glif   |  11 -
 .../glyphs/ligA_llahlong.alt.glif             |  11 -
 .../glyphs/testA_inG_afJ_eemM_eem.draft.glif  |  13 -
 .../glyphs/testA_inG_afJ_eemM_eem.glif        |  13 -
 .../glyphs/testA_inK_afB_ehR_eh.glif          |  13 -
 .../testA_lefT_ahH_ehgoalF_eh.draft.glif      |  13 -
 .../glyphs/testA_lefT_ahH_ehgoalF_eh.glif     |  13 -
 .../glyphs/testD_alS_eenB_ariyeh.glif         |  13 -
 .../glyphs/testF_ehB_ehA_inR_eh.draft.glif    |  13 -
 .../glyphs/testF_ehB_ehA_inR_eh.glif          |  13 -
 .../glyphs/testG_afS_eenH_ehdo.glif           |  13 -
 .../glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif |  13 -
 .../glyphs/testH_ehgoalS_adQ_af.glif          |  13 -
 .../testJ_eemM_eemaltL_amW_aw.draft.glif      |  13 -
 .../glyphs/testJ_eemM_eemaltL_amW_aw.glif     |  13 -
 .../glyphs/testK_afS_eenH_ehdo.draft.glif     |  13 -
 .../glyphs/testM_eemK_afR_eh.glif             |  13 -
 .../glyphs/testS_adB_ehL_amN_oon.draft.glif   |  13 -
 .../AwamiNastaliq-Regular.ufo/lib.plist       |   4 -
 77 files changed, 2 insertions(+), 7640 deletions(-)
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/ligA_llahlong.alt.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testG_afS_eenH_ehdo.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_llahlong.alt.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inK_afB_ehR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testD_alS_eenB_ariyeh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testG_afS_eenH_ehdo.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehgoalS_adQ_af.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testM_eemK_afR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Black.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/ligA_llahlong.alt.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_llahlong.alt.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inK_afB_ehR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testD_alS_eenB_ariyeh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testG_afS_eenH_ehdo.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehgoalS_adQ_af.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testM_eemK_afR_eh.glif
 delete mode 100644 source/masters/AwamiNastaliq-Regular.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif

diff --git a/source/masters/AwamiNastaliq-Black.ufo/fontinfo.plist b/source/masters/AwamiNastaliq-Black.ufo/fontinfo.plist
index 55a03c394..d32141e03 100644
--- a/source/masters/AwamiNastaliq-Black.ufo/fontinfo.plist
+++ b/source/masters/AwamiNastaliq-Black.ufo/fontinfo.plist
@@ -13,7 +13,7 @@
   <key>familyName</key>
   <string>Awami Nastaliq</string>
   <key>openTypeHeadCreated</key>
-  <string>2024/09/25 13:20:02</string>
+  <string>2024/10/01 16:30:50</string>
   <key>openTypeHheaAscender</key>
   <integer>3600</integer>
   <key>openTypeHheaDescender</key>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/contents.plist b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/contents.plist
index 9be910516..e4da455de 100644
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/contents.plist
+++ b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/contents.plist
@@ -1940,8 +1940,6 @@
   <string>ligA_layhimaaA_sS_alaam.glif</string>
   <key>ligAllahlong</key>
   <string>ligA_llahlong.glif</string>
-  <key>ligAllahlong.alt</key>
-  <string>ligA_llahlong.alt.glif</string>
   <key>ligBismillah</key>
   <string>ligB_ismillah.glif</string>
   <key>ligJallajalalouhou</key>
@@ -2098,38 +2096,6 @@
   <string>space.visX_wide.glif</string>
   <key>t</key>
   <string>t.glif</string>
-  <key>testAinGafJeemMeem</key>
-  <string>testA_inG_afJ_eemM_eem.glif</string>
-  <key>testAinGafJeemMeem.draft</key>
-  <string>testA_inG_afJ_eemM_eem.draft.glif</string>
-  <key>testAinKafBehReh</key>
-  <string>testA_inK_afB_ehR_eh.glif</string>
-  <key>testAlefTahHehgoalFeh</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.glif</string>
-  <key>testAlefTahHehgoalFeh.draft</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.draft.glif</string>
-  <key>testDalSeenBariyeh</key>
-  <string>testD_alS_eenB_ariyeh.glif</string>
-  <key>testFehBehAinReh</key>
-  <string>testF_ehB_ehA_inR_eh.glif</string>
-  <key>testFehBehAinReh.draft</key>
-  <string>testF_ehB_ehA_inR_eh.draft.glif</string>
-  <key>testGafSeenHehdo</key>
-  <string>testG_afS_eenH_ehdo.glif</string>
-  <key>testHehdoDalHehdoAinJeem</key>
-  <string>testH_ehdoD_alH_ehdoA_inJ_eem.glif</string>
-  <key>testHehgoalSadQaf</key>
-  <string>testH_ehgoalS_adQ_af.glif</string>
-  <key>testJeemMeemaltLamWaw</key>
-  <string>testJ_eemM_eemaltL_amW_aw.glif</string>
-  <key>testJeemMeemaltLamWaw.draft</key>
-  <string>testJ_eemM_eemaltL_amW_aw.draft.glif</string>
-  <key>testKafSeenHehdo.draft</key>
-  <string>testK_afS_eenH_ehdo.draft.glif</string>
-  <key>testMeemKafReh</key>
-  <string>testM_eemK_afR_eh.glif</string>
-  <key>testSadBehLamNoon.draft</key>
-  <string>testS_adB_ehL_amN_oon.draft.glif</string>
   <key>three.small</key>
   <string>three.small.glif</string>
   <key>three.smaller</key>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/ligA_llahlong.alt.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/ligA_llahlong.alt.glif
deleted file mode 100644
index 10e27c0ca..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/ligA_llahlong.alt.glif
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAllahlong.alt" format="2">
-  <outline>
-    <contour>
-      <point x="3919" y="516" type="curve"/>
-      <point x="3970" y="330"/>
-      <point x="4148" y="141"/>
-      <point x="4375" y="141" type="curve" smooth="yes"/>
-      <point x="4571" y="141"/>
-      <point x="4830" y="496"/>
-      <point x="4858" y="496" type="curve" smooth="yes"/>
-      <point x="4880" y="496"/>
-      <point x="4993" y="333"/>
-      <point x="5178" y="333" type="curve" smooth="yes"/>
-      <point x="5466" y="333"/>
-      <point x="5737" y="632"/>
-      <point x="5737" y="1001" type="curve" smooth="yes"/>
-      <point x="5737" y="1057"/>
-      <point x="5699" y="1150"/>
-      <point x="5597" y="1150" type="curve" smooth="yes"/>
-      <point x="5354" y="1150"/>
-      <point x="5151" y="836"/>
-      <point x="5014" y="645" type="curve"/>
-      <point x="5014" y="645"/>
-      <point x="5062" y="633"/>
-      <point x="5081" y="625" type="curve"/>
-      <point x="5224" y="832"/>
-      <point x="5375" y="969"/>
-      <point x="5509" y="969" type="curve" smooth="yes"/>
-      <point x="5627" y="969"/>
-      <point x="5668" y="881"/>
-      <point x="5658" y="851" type="curve" smooth="yes"/>
-      <point x="5649" y="824"/>
-      <point x="5499" y="633"/>
-      <point x="5171" y="633" type="curve" smooth="yes"/>
-      <point x="5022" y="633"/>
-      <point x="4946" y="708"/>
-      <point x="4893" y="708" type="curve" smooth="yes"/>
-      <point x="4813" y="708"/>
-      <point x="4623" y="428"/>
-      <point x="4468" y="428" type="curve" smooth="yes"/>
-      <point x="4171" y="428"/>
-      <point x="3986" y="787"/>
-      <point x="3974" y="1065" type="curve"/>
-      <point x="3974" y="1221"/>
-      <point x="3974" y="1647"/>
-      <point x="3983" y="1872" type="curve" smooth="yes"/>
-      <point x="3989" y="2024"/>
-      <point x="4013" y="2069"/>
-      <point x="4021" y="2098" type="curve" smooth="yes"/>
-      <point x="4026" y="2116"/>
-      <point x="4008" y="2165"/>
-      <point x="3988" y="2143" type="curve" smooth="yes"/>
-      <point x="3948" y="2099"/>
-      <point x="3850" y="1940"/>
-      <point x="3840" y="1774" type="curve" smooth="yes"/>
-      <point x="3822" y="1463"/>
-      <point x="3834" y="934"/>
-      <point x="3832" y="710" type="curve" smooth="yes"/>
-      <point x="3830" y="500"/>
-      <point x="3580" y="432"/>
-      <point x="3378" y="188" type="curve" smooth="yes"/>
-      <point x="3295" y="87"/>
-      <point x="3213" y="-30"/>
-      <point x="3213" y="-156" type="curve" smooth="yes"/>
-      <point x="3213" y="-380"/>
-      <point x="3701" y="-570"/>
-      <point x="3701" y="-662" type="curve" smooth="yes"/>
-      <point x="3701" y="-748"/>
-      <point x="3309" y="-1185"/>
-      <point x="2016" y="-1185" type="curve" smooth="yes"/>
-      <point x="-153" y="-1185"/>
-      <point x="452" y="-448"/>
-      <point x="776" y="79" type="curve" smooth="yes"/>
-      <point x="793" y="107"/>
-      <point x="755" y="139"/>
-      <point x="748" y="131" type="curve" smooth="yes"/>
-      <point x="420" y="-259"/>
-      <point x="346" y="-591"/>
-      <point x="346" y="-862" type="curve" smooth="yes"/>
-      <point x="346" y="-1162"/>
-      <point x="440" y="-1525"/>
-      <point x="1948" y="-1525" type="curve" smooth="yes"/>
-      <point x="3027" y="-1525"/>
-      <point x="3599" y="-1195"/>
-      <point x="3761" y="-807" type="curve" smooth="yes"/>
-      <point x="3900" y="-474"/>
-      <point x="3833" y="-349"/>
-      <point x="3770" y="-285" type="curve" smooth="yes"/>
-      <point x="3704" y="-218"/>
-      <point x="3435" y="-45"/>
-      <point x="3435" y="41" type="curve" smooth="yes"/>
-      <point x="3435" y="68"/>
-      <point x="3447" y="102"/>
-      <point x="3472" y="135" type="curve" smooth="yes"/>
-      <point x="3575" y="275"/>
-      <point x="3704" y="282"/>
-    </contour>
-    <contour>
-      <point x="5067" y="2209" type="curve" smooth="yes"/>
-      <point x="4923" y="2209"/>
-      <point x="4811" y="2022"/>
-      <point x="4715" y="1906" type="curve" smooth="yes"/>
-      <point x="4612" y="1782"/>
-      <point x="4589" y="1722"/>
-      <point x="4589" y="1673" type="curve" smooth="yes"/>
-      <point x="4589" y="1592"/>
-      <point x="4643" y="1514"/>
-      <point x="4781" y="1484" type="curve"/>
-      <point x="4781" y="1484"/>
-      <point x="5077" y="1751"/>
-      <point x="5077" y="1751" type="curve"/>
-      <point x="4894" y="1665"/>
-      <point x="4804" y="1845"/>
-      <point x="4809" y="1921" type="curve" smooth="yes"/>
-      <point x="4812" y="1963"/>
-      <point x="4869" y="2072"/>
-      <point x="4969" y="2072" type="curve" smooth="yes"/>
-      <point x="5062" y="2072"/>
-      <point x="5084" y="2025"/>
-      <point x="5146" y="2025" type="curve" smooth="yes"/>
-      <point x="5268" y="2025"/>
-      <point x="5261" y="2209"/>
-    </contour>
-    <contour>
-      <point x="2552" y="1296" type="curve" smooth="yes"/>
-      <point x="2420" y="1296"/>
-      <point x="2242" y="1237"/>
-      <point x="2053" y="819" type="curve" smooth="yes"/>
-      <point x="2047" y="807"/>
-      <point x="2071" y="797"/>
-      <point x="2078" y="805" type="curve" smooth="yes"/>
-      <point x="2227" y="978"/>
-      <point x="2356" y="1052"/>
-      <point x="2438" y="1052" type="curve" smooth="yes"/>
-      <point x="2701" y="1052"/>
-      <point x="2793" y="997"/>
-      <point x="3120" y="997" type="curve" smooth="yes"/>
-      <point x="3383" y="997"/>
-      <point x="3500" y="1281"/>
-      <point x="3599" y="1470" type="curve"/>
-      <point x="3669" y="1418"/>
-      <point x="3811" y="1333"/>
-      <point x="3887" y="1333" type="curve" smooth="yes"/>
-      <point x="3962" y="1333"/>
-      <point x="4212" y="1521"/>
-      <point x="4295" y="1648" type="curve"/>
-      <point x="4335" y="1456"/>
-      <point x="4446" y="1340"/>
-      <point x="4569" y="1340" type="curve" smooth="yes"/>
-      <point x="5089" y="1340"/>
-      <point x="5236" y="1617"/>
-      <point x="5322" y="1884" type="curve" smooth="yes"/>
-      <point x="5332" y="1915"/>
-      <point x="5276" y="1934"/>
-      <point x="5266" y="1909" type="curve" smooth="yes"/>
-      <point x="5205" y="1756"/>
-      <point x="4869" y="1680"/>
-      <point x="4684" y="1680" type="curve" smooth="yes"/>
-      <point x="4459" y="1680"/>
-      <point x="4355" y="1827"/>
-      <point x="4345" y="2095" type="curve"/>
-      <point x="4345" y="2251"/>
-      <point x="4345" y="2477"/>
-      <point x="4354" y="2702" type="curve" smooth="yes"/>
-      <point x="4360" y="2854"/>
-      <point x="4384" y="2899"/>
-      <point x="4392" y="2928" type="curve" smooth="yes"/>
-      <point x="4397" y="2946"/>
-      <point x="4379" y="2995"/>
-      <point x="4359" y="2973" type="curve" smooth="yes"/>
-      <point x="4319" y="2929"/>
-      <point x="4221" y="2770"/>
-      <point x="4211" y="2604" type="curve" smooth="yes"/>
-      <point x="4193" y="2293"/>
-      <point x="4205" y="2024"/>
-      <point x="4203" y="1800" type="curve" smooth="yes"/>
-      <point x="4201" y="1528"/>
-      <point x="3903" y="1442"/>
-      <point x="3635" y="1543" type="curve"/>
-      <point x="3650" y="1576"/>
-      <point x="3655" y="1593"/>
-      <point x="3666" y="1626" type="curve" smooth="yes"/>
-      <point x="3670" y="1639"/>
-      <point x="3653" y="1657"/>
-      <point x="3646" y="1647" type="curve" smooth="yes"/>
-      <point x="3630" y="1623"/>
-      <point x="3467" y="1256"/>
-      <point x="3227" y="1256" type="curve" smooth="yes"/>
-      <point x="3058" y="1256"/>
-      <point x="2851" y="1296"/>
-    </contour>
-    <contour>
-      <point x="2379" y="231" type="curve" smooth="yes"/>
-      <point x="2379" y="387"/>
-      <point x="2381" y="1733"/>
-      <point x="2388" y="1958" type="curve" smooth="yes"/>
-      <point x="2393" y="2110"/>
-      <point x="2418" y="2155"/>
-      <point x="2426" y="2184" type="curve" smooth="yes"/>
-      <point x="2431" y="2202"/>
-      <point x="2413" y="2251"/>
-      <point x="2393" y="2229" type="curve" smooth="yes"/>
-      <point x="2353" y="2185"/>
-      <point x="2255" y="2026"/>
-      <point x="2245" y="1860" type="curve" smooth="yes"/>
-      <point x="2227" y="1549"/>
-      <point x="2239" y="160"/>
-      <point x="2237" y="-64" type="curve" smooth="yes"/>
-      <point x="2235" y="-256"/>
-      <point x="2152" y="-341"/>
-      <point x="2042" y="-341" type="curve" smooth="yes"/>
-      <point x="1923" y="-341"/>
-      <point x="1880" y="-237"/>
-      <point x="1869" y="62" type="curve" smooth="yes"/>
-      <point x="1866" y="145"/>
-      <point x="1761" y="-67"/>
-      <point x="1770" y="-146" type="curve"/>
-      <point x="1810" y="-471"/>
-      <point x="1832" y="-686"/>
-      <point x="1995" y="-686" type="curve" smooth="yes"/>
-      <point x="2156" y="-686"/>
-      <point x="2379" y="-297"/>
-    </contour>
-    <contour>
-      <point x="1370" y="114" type="curve" smooth="yes"/>
-      <point x="1376" y="128"/>
-      <point x="1328" y="136"/>
-      <point x="1322" y="118" type="curve" smooth="yes"/>
-      <point x="1186" y="-349"/>
-      <point x="1005" y="-601"/>
-      <point x="770" y="-772" type="curve" smooth="yes"/>
-      <point x="752" y="-785"/>
-      <point x="775" y="-823"/>
-      <point x="797" y="-817" type="curve" smooth="yes"/>
-      <point x="1080" y="-749"/>
-      <point x="1191" y="-645"/>
-      <point x="1285" y="-392" type="curve"/>
-      <point x="1379" y="-518"/>
-      <point x="1342" y="-164"/>
-      <point x="1341" y="-26" type="curve" smooth="yes"/>
-      <point x="1341" y="12"/>
-      <point x="1361" y="91"/>
-    </contour>
-    <contour>
-      <point x="1871" y="102" type="curve" smooth="yes"/>
-      <point x="1871" y="181"/>
-      <point x="1874" y="1640"/>
-      <point x="1878" y="1754" type="curve" smooth="yes"/>
-      <point x="1883" y="1906"/>
-      <point x="1908" y="1951"/>
-      <point x="1916" y="1980" type="curve" smooth="yes"/>
-      <point x="1921" y="1998"/>
-      <point x="1903" y="2047"/>
-      <point x="1883" y="2025" type="curve" smooth="yes"/>
-      <point x="1843" y="1981"/>
-      <point x="1745" y="1822"/>
-      <point x="1735" y="1656" type="curve" smooth="yes"/>
-      <point x="1724" y="1458"/>
-      <point x="1722" y="-53"/>
-      <point x="1726" y="-187" type="curve" smooth="yes"/>
-      <point x="1732" y="-379"/>
-      <point x="1631" y="-425"/>
-      <point x="1534" y="-425" type="curve" smooth="yes"/>
-      <point x="1412" y="-425"/>
-      <point x="1321" y="-272"/>
-      <point x="1370" y="114" type="curve" smooth="yes"/>
-      <point x="1373" y="137"/>
-      <point x="1252" y="-152"/>
-      <point x="1256" y="-231" type="curve" smooth="yes"/>
-      <point x="1275" y="-555"/>
-      <point x="1323" y="-770"/>
-      <point x="1486" y="-770" type="curve" smooth="yes"/>
-      <point x="1617" y="-770"/>
-      <point x="1793" y="-563"/>
-      <point x="1832" y="-353" type="curve"/>
-      <point x="1848" y="-394"/>
-      <point x="1916" y="-344"/>
-      <point x="1904" y="-298" type="curve" smooth="yes"/>
-      <point x="1882" y="-211"/>
-      <point x="1871" y="-48"/>
-    </contour>
-    <contour>
-      <point x="2677" y="1168" type="curve" smooth="yes"/>
-      <point x="2651" y="701"/>
-      <point x="2764" y="79"/>
-      <point x="2745" y="-328" type="curve" smooth="yes"/>
-      <point x="2731" y="-612"/>
-      <point x="2683" y="-705"/>
-      <point x="2673" y="-760" type="curve" smooth="yes"/>
-      <point x="2668" y="-787"/>
-      <point x="2706" y="-847"/>
-      <point x="2723" y="-817" type="curve" smooth="yes"/>
-      <point x="2778" y="-721"/>
-      <point x="2899" y="-277"/>
-      <point x="2884" y="539" type="curve" smooth="yes"/>
-      <point x="2879" y="812"/>
-      <point x="2849" y="974"/>
-      <point x="2849" y="1313" type="curve" smooth="yes"/>
-      <point x="2849" y="1541"/>
-      <point x="2887" y="1606"/>
-      <point x="2895" y="1652" type="curve" smooth="yes"/>
-      <point x="2901" y="1679"/>
-      <point x="2879" y="1753"/>
-      <point x="2855" y="1720" type="curve" smooth="yes"/>
-      <point x="2806" y="1657"/>
-      <point x="2690" y="1417"/>
-    </contour>
-    <contour>
-      <point x="185" y="-26" type="curve" smooth="yes"/>
-      <point x="185" y="117"/>
-      <point x="210" y="202"/>
-      <point x="224" y="222" type="curve" smooth="yes"/>
-      <point x="249" y="258"/>
-      <point x="341" y="371"/>
-      <point x="529" y="461" type="curve" smooth="yes"/>
-      <point x="708" y="547"/>
-      <point x="924" y="586"/>
-      <point x="986" y="637" type="curve"/>
-      <point x="1033" y="684"/>
-      <point x="1063" y="747"/>
-      <point x="1063" y="851" type="curve" smooth="yes"/>
-      <point x="1063" y="1121"/>
-      <point x="988" y="981"/>
-      <point x="923" y="1020" type="curve" smooth="yes"/>
-      <point x="789" y="1095"/>
-      <point x="1217" y="1225"/>
-      <point x="1304" y="1455" type="curve"/>
-      <point x="1314" y="1526" type="line"/>
-      <point x="1358" y="1345"/>
-      <point x="1485" y="1192"/>
-      <point x="1598" y="1192" type="curve" smooth="yes"/>
-      <point x="1862" y="1192"/>
-      <point x="1966" y="1543"/>
-      <point x="2073" y="1543" type="curve" smooth="yes"/>
-      <point x="2110" y="1543"/>
-      <point x="2178" y="1486"/>
-      <point x="2229" y="1486" type="curve" smooth="yes"/>
-      <point x="2359" y="1486"/>
-      <point x="2452" y="1679"/>
-      <point x="2486" y="1679" type="curve" smooth="yes"/>
-      <point x="2508" y="1679"/>
-      <point x="2515" y="1659"/>
-      <point x="2578" y="1659" type="curve" smooth="yes"/>
-      <point x="2715" y="1659"/>
-      <point x="2808" y="1983"/>
-      <point x="2826" y="2108" type="curve" smooth="yes"/>
-      <point x="2828" y="2122"/>
-      <point x="2790" y="2143"/>
-      <point x="2788" y="2130" type="curve" smooth="yes"/>
-      <point x="2766" y="1990"/>
-      <point x="2691" y="1820"/>
-      <point x="2619" y="1820" type="curve" smooth="yes"/>
-      <point x="2538" y="1820"/>
-      <point x="2528" y="1892"/>
-      <point x="2499" y="1892" type="curve" smooth="yes"/>
-      <point x="2439" y="1892"/>
-      <point x="2365" y="1645"/>
-      <point x="2241" y="1645" type="curve" smooth="yes"/>
-      <point x="2203" y="1645"/>
-      <point x="2141" y="1695"/>
-      <point x="2103" y="1695" type="curve" smooth="yes"/>
-      <point x="1976" y="1695"/>
-      <point x="1905" y="1482"/>
-      <point x="1665" y="1482" type="curve" smooth="yes"/>
-      <point x="1500" y="1482"/>
-      <point x="1375" y="1667"/>
-      <point x="1363" y="1946" type="curve" smooth="yes"/>
-      <point x="1363" y="2102"/>
-      <point x="1363" y="2228"/>
-      <point x="1372" y="2453" type="curve" smooth="yes"/>
-      <point x="1378" y="2605"/>
-      <point x="1402" y="2650"/>
-      <point x="1410" y="2679" type="curve" smooth="yes"/>
-      <point x="1415" y="2697"/>
-      <point x="1397" y="2746"/>
-      <point x="1377" y="2724" type="curve" smooth="yes"/>
-      <point x="1337" y="2680"/>
-      <point x="1239" y="2521"/>
-      <point x="1229" y="2355" type="curve" smooth="yes"/>
-      <point x="1211" y="2044"/>
-      <point x="1223" y="1915"/>
-      <point x="1221" y="1691" type="curve" smooth="yes"/>
-      <point x="1218" y="1314"/>
-      <point x="615" y="1248"/>
-      <point x="615" y="894" type="curve" smooth="yes"/>
-      <point x="615" y="825"/>
-      <point x="641" y="801"/>
-      <point x="680" y="780" type="curve"/>
-      <point x="394" y="716"/>
-      <point x="42" y="432"/>
-      <point x="42" y="-69" type="curve" smooth="yes"/>
-      <point x="42" y="-358"/>
-      <point x="45" y="-882"/>
-      <point x="0" y="-1256" type="curve" smooth="yes"/>
-      <point x="-6" y="-1302"/>
-      <point x="56" y="-1261"/>
-      <point x="64" y="-1218" type="curve" smooth="yes"/>
-      <point x="141" y="-810"/>
-      <point x="185" y="-149"/>
-    </contour>
-    <contour>
-      <point x="2043" y="2517" type="curve" smooth="yes"/>
-      <point x="2040" y="2473"/>
-      <point x="2035" y="2325"/>
-      <point x="1958" y="2307" type="curve" smooth="yes"/>
-      <point x="1875" y="2288"/>
-      <point x="1889" y="2442"/>
-      <point x="1892" y="2482" type="curve" smooth="yes"/>
-      <point x="1893" y="2496"/>
-      <point x="1839" y="2487"/>
-      <point x="1835" y="2472" type="curve" smooth="yes"/>
-      <point x="1824" y="2431"/>
-      <point x="1809" y="2272"/>
-      <point x="1738" y="2256" type="curve" smooth="yes"/>
-      <point x="1654" y="2237"/>
-      <point x="1669" y="2394"/>
-      <point x="1679" y="2436" type="curve" smooth="yes"/>
-      <point x="1682" y="2449"/>
-      <point x="1625" y="2440"/>
-      <point x="1621" y="2425" type="curve" smooth="yes"/>
-      <point x="1595" y="2324"/>
-      <point x="1548" y="2059"/>
-      <point x="1733" y="2101" type="curve" smooth="yes"/>
-      <point x="1786" y="2113"/>
-      <point x="1815" y="2158"/>
-      <point x="1833" y="2196" type="curve"/>
-      <point x="1846" y="2172"/>
-      <point x="1878" y="2132"/>
-      <point x="1947" y="2148" type="curve" smooth="yes"/>
-      <point x="2136" y="2192"/>
-      <point x="2100" y="2485"/>
-      <point x="2100" y="2528" type="curve" smooth="yes"/>
-      <point x="2100" y="2541"/>
-      <point x="2044" y="2531"/>
-    </contour>
-    <contour>
-      <point x="1790" y="3016" type="curve" smooth="yes"/>
-      <point x="1783" y="2939"/>
-      <point x="1794" y="2781"/>
-      <point x="1785" y="2690" type="curve" smooth="yes"/>
-      <point x="1780" y="2626"/>
-      <point x="1762" y="2605"/>
-      <point x="1756" y="2592" type="curve"/>
-      <point x="1749" y="2575"/>
-      <point x="1791" y="2551"/>
-      <point x="1802" y="2564" type="curve"/>
-      <point x="1819" y="2586"/>
-      <point x="1882" y="2679"/>
-      <point x="1892" y="2807" type="curve" smooth="yes"/>
-      <point x="1897" y="2869"/>
-      <point x="1892" y="2992"/>
-      <point x="1899" y="3070" type="curve" smooth="yes"/>
-      <point x="1903" y="3110"/>
-      <point x="1907" y="3128"/>
-      <point x="1914" y="3136" type="curve"/>
-      <point x="1928" y="3156"/>
-      <point x="1893" y="3181"/>
-      <point x="1877" y="3169" type="curve"/>
-      <point x="1859" y="3154"/>
-      <point x="1798" y="3101"/>
-    </contour>
-    <contour>
-      <point x="3494" y="3011" type="curve" smooth="yes"/>
-      <point x="3403" y="3011"/>
-      <point x="3310" y="2918"/>
-      <point x="3241" y="2692" type="curve" smooth="yes"/>
-      <point x="3111" y="2264"/>
-      <point x="3280" y="2089"/>
-      <point x="3703" y="2277" type="curve" smooth="yes"/>
-      <point x="3722" y="2285"/>
-      <point x="3727" y="2269"/>
-      <point x="3727" y="2250" type="curve" smooth="yes"/>
-      <point x="3727" y="2079"/>
-      <point x="3289" y="1865"/>
-      <point x="3001" y="1747" type="curve" smooth="yes"/>
-      <point x="2979" y="1738"/>
-      <point x="3003" y="1689"/>
-      <point x="3025" y="1690" type="curve" smooth="yes"/>
-      <point x="3120" y="1694"/>
-      <point x="3637" y="1751"/>
-      <point x="3681" y="1794" type="curve" smooth="yes"/>
-      <point x="3735" y="1846"/>
-      <point x="3824" y="2244"/>
-      <point x="3824" y="2473" type="curve" smooth="yes"/>
-      <point x="3824" y="2643"/>
-      <point x="3719" y="3011"/>
-    </contour>
-    <contour>
-      <point x="5139" y="2805" type="curve" smooth="yes"/>
-      <point x="5136" y="2761"/>
-      <point x="5131" y="2613"/>
-      <point x="5054" y="2595" type="curve" smooth="yes"/>
-      <point x="4971" y="2576"/>
-      <point x="4985" y="2730"/>
-      <point x="4988" y="2770" type="curve" smooth="yes"/>
-      <point x="4989" y="2784"/>
-      <point x="4935" y="2775"/>
-      <point x="4931" y="2760" type="curve" smooth="yes"/>
-      <point x="4920" y="2719"/>
-      <point x="4905" y="2560"/>
-      <point x="4834" y="2544" type="curve" smooth="yes"/>
-      <point x="4750" y="2525"/>
-      <point x="4765" y="2682"/>
-      <point x="4775" y="2724" type="curve" smooth="yes"/>
-      <point x="4778" y="2737"/>
-      <point x="4721" y="2728"/>
-      <point x="4717" y="2713" type="curve" smooth="yes"/>
-      <point x="4691" y="2612"/>
-      <point x="4644" y="2347"/>
-      <point x="4829" y="2389" type="curve" smooth="yes"/>
-      <point x="4882" y="2401"/>
-      <point x="4911" y="2446"/>
-      <point x="4929" y="2484" type="curve"/>
-      <point x="4942" y="2460"/>
-      <point x="4974" y="2420"/>
-      <point x="5043" y="2436" type="curve" smooth="yes"/>
-      <point x="5232" y="2480"/>
-      <point x="5196" y="2773"/>
-      <point x="5196" y="2816" type="curve" smooth="yes"/>
-      <point x="5196" y="2829"/>
-      <point x="5140" y="2819"/>
-    </contour>
-    <contour>
-      <point x="3430" y="691" type="curve" smooth="yes"/>
-      <point x="3430" y="705"/>
-      <point x="3380" y="728"/>
-      <point x="3315" y="792" type="curve" smooth="yes"/>
-      <point x="3250" y="858"/>
-      <point x="3227" y="918"/>
-      <point x="3213" y="918" type="curve" smooth="yes"/>
-      <point x="3179" y="918"/>
-      <point x="3008" y="727"/>
-      <point x="3008" y="691" type="curve" smooth="yes"/>
-      <point x="3008" y="649"/>
-      <point x="3182" y="474"/>
-      <point x="3225" y="474" type="curve" smooth="yes"/>
-      <point x="3258" y="474"/>
-      <point x="3431" y="656"/>
-    </contour>
-    <contour>
-      <point x="3737" y="726" type="curve" smooth="yes"/>
-      <point x="3737" y="740"/>
-      <point x="3687" y="762"/>
-      <point x="3623" y="827" type="curve" smooth="yes"/>
-      <point x="3557" y="892"/>
-      <point x="3534" y="943"/>
-      <point x="3521" y="943" type="curve" smooth="yes"/>
-      <point x="3486" y="943"/>
-      <point x="3315" y="762"/>
-      <point x="3315" y="726" type="curve" smooth="yes"/>
-      <point x="3315" y="683"/>
-      <point x="3490" y="508"/>
-      <point x="3532" y="508" type="curve" smooth="yes"/>
-      <point x="3565" y="508"/>
-      <point x="3738" y="690"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
deleted file mode 100644
index 13ae0b2d5..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem.draft" format="2">
-  <outline>
-    <contour>
-      <point x="1403" y="1796" type="curve" smooth="yes"/>
-      <point x="1403" y="1868"/>
-      <point x="967" y="1828"/>
-      <point x="785" y="1745" type="curve" smooth="yes"/>
-      <point x="740" y="1725"/>
-      <point x="686" y="1506"/>
-      <point x="686" y="1468" type="curve" smooth="yes"/>
-      <point x="686" y="1464"/>
-      <point x="688" y="1462"/>
-      <point x="691" y="1462" type="curve" smooth="yes"/>
-      <point x="741" y="1462"/>
-      <point x="857" y="1544"/>
-      <point x="1035" y="1544" type="curve" smooth="yes"/>
-      <point x="1109" y="1544"/>
-      <point x="1199" y="1546"/>
-      <point x="1199" y="1510" type="curve" smooth="yes"/>
-      <point x="1199" y="1408"/>
-      <point x="805" y="1378"/>
-      <point x="610" y="1213" type="curve" smooth="yes"/>
-      <point x="524" y="1140"/>
-      <point x="455" y="1051"/>
-      <point x="455" y="886" type="curve" smooth="yes"/>
-      <point x="455" y="855"/>
-      <point x="486" y="799"/>
-      <point x="544" y="778" type="curve" smooth="yes"/>
-      <point x="573" y="767"/>
-      <point x="960" y="1117"/>
-      <point x="910" y="1144" type="curve" smooth="yes"/>
-      <point x="840" y="1182"/>
-      <point x="904" y="1264"/>
-      <point x="1059" y="1315" type="curve" smooth="yes"/>
-      <point x="1252" y="1379"/>
-      <point x="1403" y="1656"/>
-    </contour>
-    <contour>
-      <point x="1919" y="3773" type="curve" smooth="yes"/>
-      <point x="1605" y="3533"/>
-      <point x="1535" y="3443"/>
-      <point x="1524" y="3269" type="curve" smooth="yes"/>
-      <point x="1523" y="3250"/>
-      <point x="1551" y="3228"/>
-      <point x="1560" y="3243" type="curve" smooth="yes"/>
-      <point x="1636" y="3367"/>
-      <point x="1653" y="3382"/>
-      <point x="1920" y="3582" type="curve" smooth="yes"/>
-      <point x="2237" y="3821"/>
-      <point x="2284" y="3913"/>
-      <point x="2298" y="4076" type="curve" smooth="yes"/>
-      <point x="2299" y="4094"/>
-      <point x="2272" y="4116"/>
-      <point x="2263" y="4101" type="curve" smooth="yes"/>
-      <point x="2189" y="3982"/>
-      <point x="2181" y="3975"/>
-    </contour>
-    <contour>
-      <point x="1921" y="1668" type="curve" smooth="yes"/>
-      <point x="2218" y="1668"/>
-      <point x="2488" y="2037"/>
-      <point x="2574" y="2412" type="curve" smooth="yes"/>
-      <point x="2581" y="2444"/>
-      <point x="2528" y="2462"/>
-      <point x="2518" y="2437" type="curve" smooth="yes"/>
-      <point x="2457" y="2284"/>
-      <point x="2221" y="2208"/>
-      <point x="2036" y="2208" type="curve" smooth="yes"/>
-      <point x="1791" y="2208"/>
-      <point x="1637" y="2343"/>
-      <point x="1627" y="2608" type="curve" smooth="yes"/>
-      <point x="1624" y="2691"/>
-      <point x="1445" y="2537"/>
-      <point x="1452" y="2447" type="curve" smooth="yes"/>
-      <point x="1485" y="2001"/>
-      <point x="1631" y="1668"/>
-    </contour>
-    <contour>
-      <point x="2333" y="2802" type="curve" smooth="yes"/>
-      <point x="2169" y="2802"/>
-      <point x="2016" y="2605"/>
-      <point x="1931" y="2489" type="curve" smooth="yes"/>
-      <point x="1864" y="2398"/>
-      <point x="1855" y="2265"/>
-      <point x="1855" y="2216" type="curve" smooth="yes"/>
-      <point x="1855" y="2135"/>
-      <point x="1929" y="2017"/>
-      <point x="2067" y="1987" type="curve"/>
-      <point x="2067" y="1987"/>
-      <point x="2343" y="2274"/>
-      <point x="2343" y="2274" type="curve"/>
-      <point x="2160" y="2188"/>
-      <point x="1997" y="2305"/>
-      <point x="1995" y="2414" type="curve" smooth="yes"/>
-      <point x="1993" y="2510"/>
-      <point x="2055" y="2605"/>
-      <point x="2175" y="2605" type="curve" smooth="yes"/>
-      <point x="2288" y="2605"/>
-      <point x="2320" y="2518"/>
-      <point x="2392" y="2518" type="curve" smooth="yes"/>
-      <point x="2539" y="2518"/>
-      <point x="2540" y="2802"/>
-    </contour>
-    <contour>
-      <point x="2105" y="3539" type="curve" smooth="yes"/>
-      <point x="1792" y="3316"/>
-      <point x="1432" y="2955"/>
-      <point x="1432" y="2383" type="curve" smooth="yes"/>
-      <point x="1432" y="2325"/>
-      <point x="1430" y="2230"/>
-      <point x="1409" y="2194" type="curve" smooth="yes"/>
-      <point x="1260" y="1937"/>
-      <point x="686" y="1985"/>
-      <point x="686" y="1468" type="curve" smooth="yes"/>
-      <point x="686" y="1455"/>
-      <point x="719" y="1473"/>
-      <point x="724" y="1486" type="curve" smooth="yes"/>
-      <point x="869" y="1871"/>
-      <point x="1231" y="1726"/>
-      <point x="1467" y="2148" type="curve" smooth="yes"/>
-      <point x="1529" y="2259"/>
-      <point x="1627" y="2393"/>
-      <point x="1627" y="2608" type="curve" smooth="yes"/>
-      <point x="1627" y="2897"/>
-      <point x="1709" y="2971"/>
-      <point x="2097" y="3249" type="curve" smooth="yes"/>
-      <point x="2503" y="3540"/>
-      <point x="2581" y="3700"/>
-      <point x="2595" y="3944" type="curve" smooth="yes"/>
-      <point x="2596" y="3962"/>
-      <point x="2568" y="3984"/>
-      <point x="2559" y="3969" type="curve" smooth="yes"/>
-      <point x="2476" y="3830"/>
-      <point x="2439" y="3777"/>
-    </contour>
-    <contour>
-      <point x="46" y="32" type="curve" smooth="yes"/>
-      <point x="46" y="-257"/>
-      <point x="49" y="-711"/>
-      <point x="4" y="-1085" type="curve" smooth="yes"/>
-      <point x="-2" y="-1131"/>
-      <point x="60" y="-1090"/>
-      <point x="68" y="-1047" type="curve" smooth="yes"/>
-      <point x="145" y="-639"/>
-      <point x="194" y="-148"/>
-      <point x="194" y="-25" type="curve" smooth="yes"/>
-      <point x="194" y="118"/>
-      <point x="196" y="185"/>
-      <point x="233" y="256" type="curve" smooth="yes"/>
-      <point x="255" y="298"/>
-      <point x="332" y="380"/>
-      <point x="523" y="462" type="curve" smooth="yes"/>
-      <point x="668" y="524"/>
-      <point x="935" y="586"/>
-      <point x="980" y="621" type="curve" smooth="yes"/>
-      <point x="1068" y="692"/>
-      <point x="1086" y="778"/>
-      <point x="1086" y="957" type="curve" smooth="yes"/>
-      <point x="1086" y="1092"/>
-      <point x="854" y="1174"/>
-      <point x="824" y="1186" type="curve" smooth="yes"/>
-      <point x="801" y="1195"/>
-      <point x="456" y="928"/>
-      <point x="456" y="886" type="curve" smooth="yes"/>
-      <point x="456" y="855"/>
-      <point x="486" y="799"/>
-      <point x="545" y="778" type="curve"/>
-      <point x="341" y="732"/>
-      <point x="46" y="472"/>
-    </contour>
-    <contour>
-      <point x="1661" y="703" type="curve" smooth="yes"/>
-      <point x="1661" y="717"/>
-      <point x="1611" y="739"/>
-      <point x="1546" y="804" type="curve" smooth="yes"/>
-      <point x="1481" y="869"/>
-      <point x="1458" y="930"/>
-      <point x="1444" y="930" type="curve" smooth="yes"/>
-      <point x="1410" y="930"/>
-      <point x="1229" y="739"/>
-      <point x="1229" y="703" type="curve" smooth="yes"/>
-      <point x="1229" y="660"/>
-      <point x="1413" y="485"/>
-      <point x="1456" y="485" type="curve" smooth="yes"/>
-      <point x="1489" y="485"/>
-      <point x="1662" y="667"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
deleted file mode 100644
index 7c3a54eee..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem" format="2">
-  <outline>
-    <contour>
-      <point x="-503" y="1796" type="curve" smooth="yes"/>
-      <point x="-503" y="1868"/>
-      <point x="-939" y="1828"/>
-      <point x="-1121" y="1745" type="curve" smooth="yes"/>
-      <point x="-1166" y="1725"/>
-      <point x="-1220" y="1506"/>
-      <point x="-1220" y="1468" type="curve" smooth="yes"/>
-      <point x="-1220" y="1464"/>
-      <point x="-1218" y="1462"/>
-      <point x="-1215" y="1462" type="curve" smooth="yes"/>
-      <point x="-1165" y="1462"/>
-      <point x="-1049" y="1544"/>
-      <point x="-871" y="1544" type="curve" smooth="yes"/>
-      <point x="-797" y="1544"/>
-      <point x="-707" y="1546"/>
-      <point x="-707" y="1510" type="curve" smooth="yes"/>
-      <point x="-707" y="1408"/>
-      <point x="-1101" y="1378"/>
-      <point x="-1296" y="1213" type="curve" smooth="yes"/>
-      <point x="-1382" y="1140"/>
-      <point x="-1451" y="1051"/>
-      <point x="-1451" y="886" type="curve" smooth="yes"/>
-      <point x="-1451" y="855"/>
-      <point x="-1420" y="799"/>
-      <point x="-1362" y="778" type="curve" smooth="yes"/>
-      <point x="-1333" y="767"/>
-      <point x="-946" y="1117"/>
-      <point x="-996" y="1144" type="curve" smooth="yes"/>
-      <point x="-1066" y="1182"/>
-      <point x="-1002" y="1264"/>
-      <point x="-847" y="1315" type="curve" smooth="yes"/>
-      <point x="-654" y="1379"/>
-      <point x="-503" y="1656"/>
-    </contour>
-    <contour>
-      <point x="13" y="3773" type="curve" smooth="yes"/>
-      <point x="-301" y="3533"/>
-      <point x="-371" y="3443"/>
-      <point x="-382" y="3269" type="curve" smooth="yes"/>
-      <point x="-383" y="3250"/>
-      <point x="-355" y="3228"/>
-      <point x="-346" y="3243" type="curve" smooth="yes"/>
-      <point x="-270" y="3367"/>
-      <point x="-253" y="3382"/>
-      <point x="14" y="3582" type="curve" smooth="yes"/>
-      <point x="331" y="3821"/>
-      <point x="378" y="3913"/>
-      <point x="392" y="4076" type="curve" smooth="yes"/>
-      <point x="393" y="4094"/>
-      <point x="366" y="4116"/>
-      <point x="357" y="4101" type="curve" smooth="yes"/>
-      <point x="283" y="3982"/>
-      <point x="275" y="3975"/>
-    </contour>
-    <contour>
-      <point x="15" y="1668" type="curve" smooth="yes"/>
-      <point x="312" y="1668"/>
-      <point x="582" y="2037"/>
-      <point x="668" y="2412" type="curve" smooth="yes"/>
-      <point x="675" y="2444"/>
-      <point x="622" y="2462"/>
-      <point x="612" y="2437" type="curve" smooth="yes"/>
-      <point x="551" y="2284"/>
-      <point x="315" y="2208"/>
-      <point x="130" y="2208" type="curve" smooth="yes"/>
-      <point x="-115" y="2208"/>
-      <point x="-269" y="2343"/>
-      <point x="-279" y="2608" type="curve" smooth="yes"/>
-      <point x="-282" y="2691"/>
-      <point x="-461" y="2537"/>
-      <point x="-454" y="2447" type="curve" smooth="yes"/>
-      <point x="-421" y="2001"/>
-      <point x="-275" y="1668"/>
-    </contour>
-    <contour>
-      <point x="427" y="2802" type="curve" smooth="yes"/>
-      <point x="263" y="2802"/>
-      <point x="110" y="2605"/>
-      <point x="25" y="2489" type="curve" smooth="yes"/>
-      <point x="-42" y="2398"/>
-      <point x="-51" y="2265"/>
-      <point x="-51" y="2216" type="curve" smooth="yes"/>
-      <point x="-51" y="2135"/>
-      <point x="23" y="2017"/>
-      <point x="161" y="1987" type="curve"/>
-      <point x="161" y="1987"/>
-      <point x="437" y="2274"/>
-      <point x="437" y="2274" type="curve"/>
-      <point x="254" y="2188"/>
-      <point x="91" y="2305"/>
-      <point x="89" y="2414" type="curve" smooth="yes"/>
-      <point x="87" y="2510"/>
-      <point x="149" y="2605"/>
-      <point x="269" y="2605" type="curve" smooth="yes"/>
-      <point x="382" y="2605"/>
-      <point x="414" y="2518"/>
-      <point x="486" y="2518" type="curve" smooth="yes"/>
-      <point x="633" y="2518"/>
-      <point x="634" y="2802"/>
-    </contour>
-    <contour>
-      <point x="199" y="3539" type="curve" smooth="yes"/>
-      <point x="-114" y="3316"/>
-      <point x="-474" y="2955"/>
-      <point x="-474" y="2383" type="curve" smooth="yes"/>
-      <point x="-474" y="2325"/>
-      <point x="-476" y="2230"/>
-      <point x="-497" y="2194" type="curve" smooth="yes"/>
-      <point x="-646" y="1937"/>
-      <point x="-1220" y="1985"/>
-      <point x="-1220" y="1468" type="curve" smooth="yes"/>
-      <point x="-1220" y="1455"/>
-      <point x="-1187" y="1473"/>
-      <point x="-1182" y="1486" type="curve" smooth="yes"/>
-      <point x="-1037" y="1871"/>
-      <point x="-675" y="1726"/>
-      <point x="-439" y="2148" type="curve" smooth="yes"/>
-      <point x="-377" y="2259"/>
-      <point x="-279" y="2393"/>
-      <point x="-279" y="2608" type="curve" smooth="yes"/>
-      <point x="-279" y="2897"/>
-      <point x="-197" y="2971"/>
-      <point x="191" y="3249" type="curve" smooth="yes"/>
-      <point x="597" y="3540"/>
-      <point x="675" y="3700"/>
-      <point x="689" y="3944" type="curve" smooth="yes"/>
-      <point x="690" y="3962"/>
-      <point x="662" y="3984"/>
-      <point x="653" y="3969" type="curve" smooth="yes"/>
-      <point x="570" y="3830"/>
-      <point x="533" y="3777"/>
-    </contour>
-    <contour>
-      <point x="-1860" y="32" type="curve" smooth="yes"/>
-      <point x="-1860" y="-257"/>
-      <point x="-1857" y="-711"/>
-      <point x="-1902" y="-1085" type="curve" smooth="yes"/>
-      <point x="-1908" y="-1131"/>
-      <point x="-1846" y="-1090"/>
-      <point x="-1838" y="-1047" type="curve" smooth="yes"/>
-      <point x="-1761" y="-639"/>
-      <point x="-1712" y="-148"/>
-      <point x="-1712" y="-25" type="curve" smooth="yes"/>
-      <point x="-1712" y="118"/>
-      <point x="-1710" y="185"/>
-      <point x="-1673" y="256" type="curve" smooth="yes"/>
-      <point x="-1651" y="298"/>
-      <point x="-1574" y="380"/>
-      <point x="-1383" y="462" type="curve" smooth="yes"/>
-      <point x="-1238" y="524"/>
-      <point x="-971" y="586"/>
-      <point x="-926" y="621" type="curve" smooth="yes"/>
-      <point x="-838" y="692"/>
-      <point x="-820" y="778"/>
-      <point x="-820" y="957" type="curve" smooth="yes"/>
-      <point x="-820" y="1092"/>
-      <point x="-1052" y="1174"/>
-      <point x="-1082" y="1186" type="curve" smooth="yes"/>
-      <point x="-1105" y="1195"/>
-      <point x="-1450" y="928"/>
-      <point x="-1450" y="886" type="curve" smooth="yes"/>
-      <point x="-1450" y="855"/>
-      <point x="-1420" y="799"/>
-      <point x="-1361" y="778" type="curve"/>
-      <point x="-1565" y="732"/>
-      <point x="-1860" y="472"/>
-    </contour>
-    <contour>
-      <point x="1935" y="804" type="curve" smooth="yes"/>
-      <point x="1935" y="818"/>
-      <point x="1885" y="840"/>
-      <point x="1820" y="905" type="curve" smooth="yes"/>
-      <point x="1755" y="970"/>
-      <point x="1732" y="1031"/>
-      <point x="1718" y="1031" type="curve" smooth="yes"/>
-      <point x="1684" y="1031"/>
-      <point x="1503" y="840"/>
-      <point x="1503" y="804" type="curve" smooth="yes"/>
-      <point x="1503" y="761"/>
-      <point x="1687" y="586"/>
-      <point x="1730" y="586" type="curve" smooth="yes"/>
-      <point x="1763" y="586"/>
-      <point x="1936" y="768"/>
-    </contour>
-    <contour>
-      <point x="800" y="880" type="curve"/>
-      <point x="514" y="816"/>
-      <point x="142" y="532"/>
-      <point x="142" y="31" type="curve" smooth="yes"/>
-      <point x="142" y="-258"/>
-      <point x="145" y="-712"/>
-      <point x="100" y="-1086" type="curve" smooth="yes"/>
-      <point x="94" y="-1132"/>
-      <point x="156" y="-1091"/>
-      <point x="164" y="-1048" type="curve" smooth="yes"/>
-      <point x="241" y="-640"/>
-      <point x="275" y="-49"/>
-      <point x="275" y="74" type="curve" smooth="yes"/>
-      <point x="275" y="217"/>
-      <point x="294" y="286"/>
-      <point x="321" y="332" type="curve" smooth="yes"/>
-      <point x="348" y="378"/>
-      <point x="443" y="466"/>
-      <point x="634" y="548" type="curve" smooth="yes"/>
-      <point x="779" y="610"/>
-      <point x="1190" y="687"/>
-      <point x="1235" y="723" type="curve"/>
-      <point x="1341" y="792"/>
-      <point x="1341" y="985"/>
-      <point x="1341" y="1059" type="curve" smooth="yes"/>
-      <point x="1341" y="1194"/>
-      <point x="1071" y="1298"/>
-      <point x="1039" y="1298" type="curve" smooth="yes"/>
-      <point x="1016" y="1298"/>
-      <point x="711" y="1030"/>
-      <point x="711" y="988" type="curve" smooth="yes"/>
-      <point x="711" y="957"/>
-      <point x="761" y="900"/>
-    </contour>
-    <contour>
-      <point x="1706" y="2042" type="curve" smooth="yes"/>
-      <point x="1706" y="2093"/>
-      <point x="1272" y="2067"/>
-      <point x="1179" y="2034" type="curve" smooth="yes"/>
-      <point x="1084" y="2000"/>
-      <point x="979" y="1666"/>
-      <point x="979" y="1633" type="curve" smooth="yes"/>
-      <point x="979" y="1629"/>
-      <point x="981" y="1627"/>
-      <point x="984" y="1627" type="curve" smooth="yes"/>
-      <point x="1034" y="1627"/>
-      <point x="1180" y="1710"/>
-      <point x="1348" y="1710" type="curve" smooth="yes"/>
-      <point x="1449" y="1710"/>
-      <point x="1489" y="1704"/>
-      <point x="1489" y="1688" type="curve" smooth="yes"/>
-      <point x="1489" y="1571"/>
-      <point x="1114" y="1490"/>
-      <point x="958" y="1395" type="curve" smooth="yes"/>
-      <point x="738" y="1261"/>
-      <point x="701" y="1113"/>
-      <point x="701" y="993" type="curve" smooth="yes"/>
-      <point x="701" y="962"/>
-      <point x="751" y="906"/>
-      <point x="790" y="886" type="curve" smooth="yes"/>
-      <point x="817" y="871"/>
-      <point x="1169" y="1245"/>
-      <point x="1112" y="1275" type="curve" smooth="yes"/>
-      <point x="1053" y="1305"/>
-      <point x="1198" y="1378"/>
-      <point x="1292" y="1420" type="curve" smooth="yes"/>
-      <point x="1603" y="1559"/>
-      <point x="1706" y="1926"/>
-    </contour>
-    <contour>
-      <point x="2932" y="4118" type="curve" smooth="yes"/>
-      <point x="2847" y="3980"/>
-      <point x="2811" y="3934"/>
-      <point x="2433" y="3662" type="curve" smooth="yes"/>
-      <point x="2014" y="3361"/>
-      <point x="1772" y="3071"/>
-      <point x="1772" y="2573" type="curve" smooth="yes"/>
-      <point x="1772" y="2515"/>
-      <point x="1775" y="2437"/>
-      <point x="1754" y="2401" type="curve" smooth="yes"/>
-      <point x="1655" y="2232"/>
-      <point x="978" y="2152"/>
-      <point x="978" y="1515" type="curve"/>
-      <point x="1011" y="1515"/>
-      <point x="1050" y="1537"/>
-      <point x="1057" y="1556" type="curve" smooth="yes"/>
-      <point x="1249" y="2076"/>
-      <point x="1591" y="1982"/>
-      <point x="1791" y="2299" type="curve" smooth="yes"/>
-      <point x="1861" y="2411"/>
-      <point x="1939" y="2601"/>
-      <point x="1939" y="2776" type="curve" smooth="yes"/>
-      <point x="1939" y="3066"/>
-      <point x="1973" y="3048"/>
-      <point x="2416" y="3366" type="curve" smooth="yes"/>
-      <point x="2822" y="3658"/>
-      <point x="2953" y="3849"/>
-      <point x="2968" y="4093" type="curve" smooth="yes"/>
-      <point x="2969" y="4111"/>
-      <point x="2941" y="4133"/>
-    </contour>
-    <contour>
-      <point x="2255" y="3951" type="curve" smooth="yes"/>
-      <point x="1941" y="3711"/>
-      <point x="1871" y="3590"/>
-      <point x="1860" y="3377" type="curve" smooth="yes"/>
-      <point x="1859" y="3358"/>
-      <point x="1887" y="3336"/>
-      <point x="1896" y="3351" type="curve" smooth="yes"/>
-      <point x="1972" y="3475"/>
-      <point x="2038" y="3522"/>
-      <point x="2300" y="3724" type="curve" smooth="yes"/>
-      <point x="2571" y="3933"/>
-      <point x="2620" y="4101"/>
-      <point x="2634" y="4264" type="curve" smooth="yes"/>
-      <point x="2635" y="4282"/>
-      <point x="2608" y="4304"/>
-      <point x="2599" y="4289" type="curve" smooth="yes"/>
-      <point x="2525" y="4170"/>
-      <point x="2480" y="4123"/>
-    </contour>
-    <contour>
-      <point x="2241" y="2657" type="curve" smooth="yes"/>
-      <point x="2193" y="2598"/>
-      <point x="2161" y="2519"/>
-      <point x="2161" y="2446" type="curve" smooth="yes"/>
-      <point x="2161" y="2363"/>
-      <point x="2213" y="2294"/>
-      <point x="2351" y="2264" type="curve"/>
-      <point x="2443" y="2273"/>
-      <point x="2843" y="2463"/>
-      <point x="2911" y="2562" type="curve"/>
-      <point x="2880" y="2540"/>
-      <point x="2831" y="2524"/>
-      <point x="2725" y="2524" type="curve" smooth="yes"/>
-      <point x="2584" y="2524"/>
-      <point x="2497" y="2658"/>
-      <point x="2497" y="2782" type="curve" smooth="yes"/>
-      <point x="2497" y="2824"/>
-      <point x="2548" y="2910"/>
-      <point x="2612" y="2910" type="curve" smooth="yes"/>
-      <point x="2750" y="2910"/>
-      <point x="2763" y="2801"/>
-      <point x="2870" y="2801" type="curve" smooth="yes"/>
-      <point x="3092" y="2801"/>
-      <point x="3054" y="3125"/>
-      <point x="2805" y="3123" type="curve" smooth="yes"/>
-      <point x="2668" y="3122"/>
-      <point x="2474" y="2944"/>
-    </contour>
-    <contour>
-      <point x="2293" y="1852" type="curve" smooth="yes"/>
-      <point x="2668" y="1852"/>
-      <point x="2952" y="2225"/>
-      <point x="3066" y="2720" type="curve"/>
-      <point x="3071" y="2736"/>
-      <point x="3047" y="2751"/>
-      <point x="3041" y="2735" type="curve" smooth="yes"/>
-      <point x="2989" y="2585"/>
-      <point x="2725" y="2372"/>
-      <point x="2408" y="2372" type="curve" smooth="yes"/>
-      <point x="2163" y="2372"/>
-      <point x="1949" y="2495"/>
-      <point x="1939" y="2760" type="curve" smooth="yes"/>
-      <point x="1936" y="2830"/>
-      <point x="1808" y="2702"/>
-      <point x="1814" y="2612" type="curve" smooth="yes"/>
-      <point x="1839" y="2238"/>
-      <point x="1953" y="1852"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
deleted file mode 100644
index c168d1416..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinKafBehReh" format="2">
-  <outline>
-    <contour>
-      <point x="1016" y="806" type="curve" smooth="yes"/>
-      <point x="604" y="394"/>
-      <point x="670" y="-264"/>
-      <point x="104" y="-578" type="curve" smooth="yes"/>
-      <point x="86" y="-588"/>
-      <point x="137" y="-608"/>
-      <point x="158" y="-598" type="curve" smooth="yes"/>
-      <point x="597" y="-389"/>
-      <point x="726" y="55"/>
-      <point x="1016" y="313" type="curve" smooth="yes"/>
-      <point x="1079" y="369"/>
-      <point x="1082" y="872"/>
-    </contour>
-    <contour>
-      <point x="1282" y="911" type="curve" smooth="yes"/>
-      <point x="1169" y="911"/>
-      <point x="1081" y="875"/>
-      <point x="1009" y="799" type="curve" smooth="yes"/>
-      <point x="976" y="765"/>
-      <point x="960" y="261"/>
-      <point x="1009" y="306" type="curve" smooth="yes"/>
-      <point x="1144" y="427"/>
-      <point x="1233" y="319"/>
-      <point x="1377" y="319" type="curve" smooth="yes"/>
-      <point x="1437" y="319"/>
-      <point x="1429" y="892"/>
-      <point x="1377" y="901" type="curve" smooth="yes"/>
-      <point x="1352" y="906"/>
-      <point x="1326" y="911"/>
-    </contour>
-    <contour>
-      <point x="1376" y="319" type="curve" smooth="yes"/>
-      <point x="1602" y="319"/>
-      <point x="1705" y="747"/>
-      <point x="1752" y="907" type="curve" smooth="yes"/>
-      <point x="1795" y="1053"/>
-      <point x="1856" y="1335"/>
-      <point x="1856" y="1515" type="curve" smooth="yes"/>
-      <point x="1856" y="1602"/>
-      <point x="1860" y="1686"/>
-      <point x="1862" y="1746" type="curve" smooth="yes"/>
-      <point x="1873" y="2036"/>
-      <point x="1896" y="2052"/>
-      <point x="2339" y="2370" type="curve" smooth="yes"/>
-      <point x="2745" y="2662"/>
-      <point x="2866" y="2853"/>
-      <point x="2881" y="3097" type="curve" smooth="yes"/>
-      <point x="2882" y="3115"/>
-      <point x="2854" y="3137"/>
-      <point x="2845" y="3122" type="curve" smooth="yes"/>
-      <point x="2760" y="2984"/>
-      <point x="2724" y="2938"/>
-      <point x="2346" y="2666" type="curve" smooth="yes"/>
-      <point x="1927" y="2365"/>
-      <point x="1685" y="2055"/>
-      <point x="1685" y="1557" type="curve" smooth="yes"/>
-      <point x="1685" y="1240"/>
-      <point x="1717" y="1007"/>
-      <point x="1682" y="945" type="curve" smooth="yes"/>
-      <point x="1658" y="901"/>
-      <point x="1622" y="891"/>
-      <point x="1514" y="891" type="curve" smooth="yes"/>
-      <point x="1461" y="891"/>
-      <point x="1404" y="896"/>
-      <point x="1376" y="901" type="curve" smooth="yes"/>
-      <point x="1329" y="909"/>
-      <point x="1334" y="319"/>
-    </contour>
-    <contour>
-      <point x="2159" y="1344" type="curve" smooth="yes"/>
-      <point x="2111" y="1285"/>
-      <point x="2079" y="1206"/>
-      <point x="2079" y="1133" type="curve" smooth="yes"/>
-      <point x="2079" y="1050"/>
-      <point x="2131" y="981"/>
-      <point x="2269" y="951" type="curve"/>
-      <point x="2361" y="960"/>
-      <point x="2761" y="1150"/>
-      <point x="2829" y="1249" type="curve"/>
-      <point x="2798" y="1227"/>
-      <point x="2749" y="1211"/>
-      <point x="2643" y="1211" type="curve" smooth="yes"/>
-      <point x="2502" y="1211"/>
-      <point x="2415" y="1345"/>
-      <point x="2415" y="1469" type="curve" smooth="yes"/>
-      <point x="2415" y="1511"/>
-      <point x="2466" y="1597"/>
-      <point x="2530" y="1597" type="curve" smooth="yes"/>
-      <point x="2668" y="1597"/>
-      <point x="2681" y="1488"/>
-      <point x="2788" y="1488" type="curve" smooth="yes"/>
-      <point x="3010" y="1488"/>
-      <point x="2972" y="1812"/>
-      <point x="2723" y="1810" type="curve" smooth="yes"/>
-      <point x="2586" y="1809"/>
-      <point x="2392" y="1631"/>
-    </contour>
-    <contour>
-      <point x="2211" y="539" type="curve" smooth="yes"/>
-      <point x="2586" y="539"/>
-      <point x="2870" y="912"/>
-      <point x="2984" y="1407" type="curve"/>
-      <point x="2989" y="1423"/>
-      <point x="2965" y="1438"/>
-      <point x="2959" y="1422" type="curve" smooth="yes"/>
-      <point x="2907" y="1272"/>
-      <point x="2643" y="1059"/>
-      <point x="2326" y="1059" type="curve" smooth="yes"/>
-      <point x="2081" y="1059"/>
-      <point x="1867" y="1182"/>
-      <point x="1857" y="1447" type="curve" smooth="yes"/>
-      <point x="1854" y="1517"/>
-      <point x="1726" y="1389"/>
-      <point x="1732" y="1299" type="curve" smooth="yes"/>
-      <point x="1757" y="925"/>
-      <point x="1871" y="539"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
deleted file mode 100644
index f2a2b7f9b..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh.draft" format="2">
-  <outline>
-    <contour>
-      <point x="4362" y="1366" type="curve" smooth="yes"/>
-      <point x="4341" y="1055"/>
-      <point x="4368" y="753"/>
-      <point x="4352" y="482" type="curve" smooth="yes"/>
-      <point x="4341" y="293"/>
-      <point x="4301" y="231"/>
-      <point x="4292" y="194" type="curve" smooth="yes"/>
-      <point x="4288" y="176"/>
-      <point x="4320" y="136"/>
-      <point x="4334" y="156" type="curve" smooth="yes"/>
-      <point x="4380" y="220"/>
-      <point x="4492" y="516"/>
-      <point x="4513" y="860" type="curve" smooth="yes"/>
-      <point x="4524" y="1042"/>
-      <point x="4526" y="1237"/>
-      <point x="4526" y="1463" type="curve" smooth="yes"/>
-      <point x="4526" y="1615"/>
-      <point x="4557" y="1658"/>
-      <point x="4564" y="1689" type="curve" smooth="yes"/>
-      <point x="4569" y="1707"/>
-      <point x="4551" y="1756"/>
-      <point x="4531" y="1734" type="curve" smooth="yes"/>
-      <point x="4490" y="1692"/>
-      <point x="4373" y="1532"/>
-    </contour>
-    <contour>
-      <point x="3383" y="2324" type="curve" smooth="yes"/>
-      <point x="3360" y="1896"/>
-      <point x="3469" y="1295"/>
-      <point x="3225" y="893" type="curve" smooth="yes"/>
-      <point x="3214" y="875"/>
-      <point x="3279" y="849"/>
-      <point x="3294" y="871" type="curve" smooth="yes"/>
-      <point x="3553" y="1248"/>
-      <point x="3549" y="1948"/>
-      <point x="3547" y="2420" type="curve" smooth="yes"/>
-      <point x="3546" y="2572"/>
-      <point x="3576" y="2616"/>
-      <point x="3584" y="2646" type="curve" smooth="yes"/>
-      <point x="3588" y="2664"/>
-      <point x="3569" y="2714"/>
-      <point x="3549" y="2692" type="curve" smooth="yes"/>
-      <point x="3509" y="2649"/>
-      <point x="3392" y="2489"/>
-    </contour>
-    <contour>
-      <point x="2940" y="812" type="curve" smooth="yes"/>
-      <point x="3041" y="812"/>
-      <point x="3096" y="689"/>
-      <point x="3096" y="528" type="curve" smooth="yes"/>
-      <point x="3096" y="518"/>
-      <point x="3130" y="518"/>
-      <point x="3130" y="528" type="curve" smooth="yes"/>
-      <point x="3130" y="549"/>
-      <point x="3182" y="1099"/>
-      <point x="2953" y="1099" type="curve" smooth="yes"/>
-      <point x="2777" y="1099"/>
-      <point x="2692" y="502"/>
-      <point x="2156" y="618" type="curve" smooth="yes"/>
-      <point x="2082" y="634"/>
-      <point x="2015" y="405"/>
-      <point x="2067" y="393" type="curve" smooth="yes"/>
-      <point x="2601" y="270"/>
-      <point x="2722" y="812"/>
-    </contour>
-    <contour>
-      <point x="2959" y="368" type="curve" smooth="yes"/>
-      <point x="2775" y="100"/>
-      <point x="2811" y="-182"/>
-      <point x="2969" y="-182" type="curve" smooth="yes"/>
-      <point x="3165" y="-182"/>
-      <point x="3123" y="105"/>
-      <point x="3068" y="105" type="curve" smooth="yes"/>
-      <point x="3029" y="105"/>
-      <point x="3028" y="41"/>
-      <point x="2996" y="41" type="curve" smooth="yes"/>
-      <point x="2937" y="41"/>
-      <point x="2895" y="118"/>
-      <point x="3006" y="352" type="curve" smooth="yes"/>
-      <point x="3010" y="361"/>
-      <point x="2967" y="379"/>
-    </contour>
-    <contour>
-      <point x="2067" y="393" type="curve" smooth="yes"/>
-      <point x="2098" y="391"/>
-      <point x="2181" y="616"/>
-      <point x="2156" y="618" type="curve" smooth="yes"/>
-      <point x="2021" y="627"/>
-      <point x="1894" y="782"/>
-      <point x="1894" y="876" type="curve" smooth="yes"/>
-      <point x="1894" y="971"/>
-      <point x="2012" y="1045"/>
-      <point x="2112" y="1045" type="curve" smooth="yes"/>
-      <point x="2212" y="1045"/>
-      <point x="2291" y="977"/>
-      <point x="2291" y="894" type="curve" smooth="yes"/>
-      <point x="2291" y="684"/>
-      <point x="1808" y="541"/>
-      <point x="1098" y="541" type="curve" smooth="yes"/>
-      <point x="725" y="541"/>
-      <point x="136" y="525"/>
-      <point x="224" y="982" type="curve" smooth="yes"/>
-      <point x="228" y="1006"/>
-      <point x="179" y="1048"/>
-      <point x="172" y="1025" type="curve" smooth="yes"/>
-      <point x="16" y="499"/>
-      <point x="46" y="-19"/>
-      <point x="950" y="-19" type="curve" smooth="yes"/>
-      <point x="1914" y="-19"/>
-      <point x="2399" y="482"/>
-      <point x="2399" y="994" type="curve" smooth="yes"/>
-      <point x="2399" y="1160"/>
-      <point x="2374" y="1376"/>
-      <point x="2206" y="1376" type="curve" smooth="yes"/>
-      <point x="1960" y="1376"/>
-      <point x="1769" y="1048"/>
-      <point x="1771" y="766" type="curve" smooth="yes"/>
-      <point x="1773" y="509"/>
-      <point x="1960" y="401"/>
-    </contour>
-    <contour>
-      <point x="3257" y="920" type="curve" smooth="yes"/>
-      <point x="3214" y="834"/>
-      <point x="3384" y="971"/>
-      <point x="3396" y="1019" type="curve" smooth="yes"/>
-      <point x="3491" y="1397"/>
-      <point x="3624" y="1514"/>
-      <point x="3736" y="1514" type="curve" smooth="yes"/>
-      <point x="3771" y="1514"/>
-      <point x="3821" y="1479"/>
-      <point x="3821" y="1425" type="curve" smooth="yes"/>
-      <point x="3821" y="1162"/>
-      <point x="3094" y="1092"/>
-      <point x="3094" y="528" type="curve" smooth="yes"/>
-      <point x="3094" y="516"/>
-      <point x="3131" y="517"/>
-      <point x="3131" y="528" type="curve" smooth="yes"/>
-      <point x="3131" y="971"/>
-      <point x="4065" y="1030"/>
-      <point x="4065" y="1575" type="curve" smooth="yes"/>
-      <point x="4065" y="1696"/>
-      <point x="3988" y="1810"/>
-      <point x="3863" y="1810" type="curve" smooth="yes"/>
-      <point x="3543" y="1810"/>
-      <point x="3432" y="1266"/>
-    </contour>
-    <contour>
-      <point x="2394" y="1813" type="curve" smooth="yes"/>
-      <point x="2394" y="1827"/>
-      <point x="2344" y="1849"/>
-      <point x="2279" y="1914" type="curve" smooth="yes"/>
-      <point x="2214" y="1979"/>
-      <point x="2191" y="2040"/>
-      <point x="2177" y="2040" type="curve" smooth="yes"/>
-      <point x="2143" y="2040"/>
-      <point x="1962" y="1849"/>
-      <point x="1962" y="1813" type="curve" smooth="yes"/>
-      <point x="1962" y="1770"/>
-      <point x="2146" y="1595"/>
-      <point x="2189" y="1595" type="curve" smooth="yes"/>
-      <point x="2222" y="1595"/>
-      <point x="2395" y="1777"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
deleted file mode 100644
index a05c5da29..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh" format="2">
-  <outline>
-    <contour>
-      <point x="2394" y="2113" type="curve" smooth="yes"/>
-      <point x="2394" y="2127"/>
-      <point x="2344" y="2149"/>
-      <point x="2279" y="2214" type="curve" smooth="yes"/>
-      <point x="2214" y="2279"/>
-      <point x="2191" y="2340"/>
-      <point x="2177" y="2340" type="curve" smooth="yes"/>
-      <point x="2143" y="2340"/>
-      <point x="1962" y="2149"/>
-      <point x="1962" y="2113" type="curve" smooth="yes"/>
-      <point x="1962" y="2070"/>
-      <point x="2146" y="1895"/>
-      <point x="2189" y="1895" type="curve" smooth="yes"/>
-      <point x="2222" y="1895"/>
-      <point x="2395" y="2077"/>
-    </contour>
-    <contour>
-      <point x="956" y="-10" type="curve" smooth="yes"/>
-      <point x="2074" y="-10"/>
-      <point x="2457" y="573"/>
-      <point x="2457" y="1300" type="curve" smooth="yes"/>
-      <point x="2457" y="1464"/>
-      <point x="2432" y="1682"/>
-      <point x="2264" y="1682" type="curve" smooth="yes"/>
-      <point x="2018" y="1682"/>
-      <point x="1829" y="1354"/>
-      <point x="1829" y="1072" type="curve" smooth="yes"/>
-      <point x="1829" y="815"/>
-      <point x="2018" y="707"/>
-      <point x="2125" y="699" type="curve" smooth="yes"/>
-      <point x="2160" y="696"/>
-      <point x="2237" y="921"/>
-      <point x="2220" y="922" type="curve" smooth="yes"/>
-      <point x="2079" y="933"/>
-      <point x="1952" y="1088"/>
-      <point x="1952" y="1182" type="curve" smooth="yes"/>
-      <point x="1952" y="1277"/>
-      <point x="2071" y="1351"/>
-      <point x="2171" y="1351" type="curve" smooth="yes"/>
-      <point x="2271" y="1351"/>
-      <point x="2354" y="1281"/>
-      <point x="2349" y="1200" type="curve" smooth="yes"/>
-      <point x="2318" y="722"/>
-      <point x="1532" y="550"/>
-      <point x="1123" y="550" type="curve" smooth="yes"/>
-      <point x="750" y="550"/>
-      <point x="142" y="534"/>
-      <point x="230" y="991" type="curve" smooth="yes"/>
-      <point x="234" y="1015"/>
-      <point x="185" y="1057"/>
-      <point x="178" y="1034" type="curve" smooth="yes"/>
-      <point x="22" y="508"/>
-      <point x="40" y="-10"/>
-    </contour>
-    <contour>
-      <point x="3093" y="665" type="curve" smooth="yes"/>
-      <point x="2927" y="397"/>
-      <point x="2945" y="115"/>
-      <point x="3103" y="115" type="curve" smooth="yes"/>
-      <point x="3299" y="115"/>
-      <point x="3257" y="402"/>
-      <point x="3202" y="402" type="curve" smooth="yes"/>
-      <point x="3163" y="402"/>
-      <point x="3162" y="338"/>
-      <point x="3130" y="338" type="curve" smooth="yes"/>
-      <point x="3071" y="338"/>
-      <point x="3039" y="415"/>
-      <point x="3140" y="649" type="curve" smooth="yes"/>
-      <point x="3144" y="658"/>
-      <point x="3100" y="676"/>
-    </contour>
-    <contour>
-      <point x="2322" y="906" type="curve" smooth="yes"/>
-      <point x="2292" y="906"/>
-      <point x="2259" y="909"/>
-      <point x="2224" y="917" type="curve" smooth="yes"/>
-      <point x="2150" y="933"/>
-      <point x="2083" y="692"/>
-      <point x="2135" y="692" type="curve" smooth="yes"/>
-      <point x="2729" y="692"/>
-      <point x="2840" y="1257"/>
-      <point x="3008" y="1257" type="curve" smooth="yes"/>
-      <point x="3099" y="1257"/>
-      <point x="3158" y="1084"/>
-      <point x="3158" y="923" type="curve" smooth="yes"/>
-      <point x="3158" y="913"/>
-      <point x="3198" y="913"/>
-      <point x="3198" y="923" type="curve" smooth="yes"/>
-      <point x="3198" y="944"/>
-      <point x="3230" y="1554"/>
-      <point x="3021" y="1554" type="curve" smooth="yes"/>
-      <point x="2866" y="1554"/>
-      <point x="2704" y="906"/>
-    </contour>
-    <contour>
-      <point x="3449" y="2720" type="curve" smooth="yes"/>
-      <point x="3426" y="2292"/>
-      <point x="3535" y="1691"/>
-      <point x="3291" y="1289" type="curve" smooth="yes"/>
-      <point x="3280" y="1271"/>
-      <point x="3345" y="1245"/>
-      <point x="3360" y="1267" type="curve" smooth="yes"/>
-      <point x="3619" y="1644"/>
-      <point x="3615" y="2344"/>
-      <point x="3613" y="2816" type="curve" smooth="yes"/>
-      <point x="3612" y="2968"/>
-      <point x="3642" y="3012"/>
-      <point x="3650" y="3042" type="curve" smooth="yes"/>
-      <point x="3654" y="3060"/>
-      <point x="3635" y="3110"/>
-      <point x="3615" y="3088" type="curve" smooth="yes"/>
-      <point x="3575" y="3045"/>
-      <point x="3458" y="2885"/>
-    </contour>
-    <contour>
-      <point x="3323" y="1316" type="curve" smooth="yes"/>
-      <point x="3280" y="1230"/>
-      <point x="3450" y="1367"/>
-      <point x="3462" y="1415" type="curve" smooth="yes"/>
-      <point x="3557" y="1793"/>
-      <point x="3741" y="1937"/>
-      <point x="3834" y="1940" type="curve" smooth="yes"/>
-      <point x="3897" y="1942"/>
-      <point x="3921" y="1919"/>
-      <point x="3921" y="1871" type="curve" smooth="yes"/>
-      <point x="3921" y="1655"/>
-      <point x="3160" y="1488"/>
-      <point x="3160" y="924" type="curve" smooth="yes"/>
-      <point x="3160" y="912"/>
-      <point x="3197" y="913"/>
-      <point x="3197" y="924" type="curve" smooth="yes"/>
-      <point x="3197" y="1367"/>
-      <point x="4164" y="1473"/>
-      <point x="4164" y="2088" type="curve" smooth="yes"/>
-      <point x="4164" y="2239"/>
-      <point x="4077" y="2278"/>
-      <point x="3979" y="2278" type="curve" smooth="yes"/>
-      <point x="3659" y="2278"/>
-      <point x="3498" y="1662"/>
-    </contour>
-    <contour>
-      <point x="4373" y="1355" type="curve" smooth="yes"/>
-      <point x="4352" y="1044"/>
-      <point x="4379" y="742"/>
-      <point x="4363" y="471" type="curve" smooth="yes"/>
-      <point x="4352" y="282"/>
-      <point x="4312" y="220"/>
-      <point x="4303" y="183" type="curve" smooth="yes"/>
-      <point x="4299" y="165"/>
-      <point x="4331" y="125"/>
-      <point x="4345" y="145" type="curve" smooth="yes"/>
-      <point x="4391" y="209"/>
-      <point x="4503" y="505"/>
-      <point x="4524" y="849" type="curve" smooth="yes"/>
-      <point x="4535" y="1031"/>
-      <point x="4537" y="1226"/>
-      <point x="4537" y="1452" type="curve" smooth="yes"/>
-      <point x="4537" y="1604"/>
-      <point x="4568" y="1647"/>
-      <point x="4575" y="1678" type="curve" smooth="yes"/>
-      <point x="4580" y="1696"/>
-      <point x="4562" y="1745"/>
-      <point x="4542" y="1723" type="curve" smooth="yes"/>
-      <point x="4501" y="1681"/>
-      <point x="4384" y="1521"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
deleted file mode 100644
index d3a92595d..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testDalSeenBariyeh" format="2">
-  <outline>
-    <contour>
-      <point x="1030" y="-10" type="curve" smooth="yes"/>
-      <point x="1878" y="-10"/>
-      <point x="2440" y="411"/>
-      <point x="2693" y="668" type="curve" smooth="yes"/>
-      <point x="2709" y="684"/>
-      <point x="2684" y="719"/>
-      <point x="2661" y="712" type="curve" smooth="yes"/>
-      <point x="2294" y="595"/>
-      <point x="1854" y="550"/>
-      <point x="1106" y="550" type="curve" smooth="yes"/>
-      <point x="551" y="550"/>
-      <point x="152" y="571"/>
-      <point x="196" y="669" type="curve" smooth="yes"/>
-      <point x="205" y="690"/>
-      <point x="159" y="769"/>
-      <point x="133" y="692" type="curve" smooth="yes"/>
-      <point x="112" y="629"/>
-      <point x="103" y="568"/>
-      <point x="103" y="512" type="curve" smooth="yes"/>
-      <point x="103" y="230"/>
-      <point x="212" y="-10"/>
-    </contour>
-    <contour>
-      <point x="924" y="1326" type="curve" smooth="yes"/>
-      <point x="868" y="1326"/>
-      <point x="843" y="1405"/>
-      <point x="805" y="1405" type="curve" smooth="yes"/>
-      <point x="699" y="1405"/>
-      <point x="700" y="1172"/>
-      <point x="421" y="1079" type="curve" smooth="yes"/>
-      <point x="225" y="1014"/>
-      <point x="188" y="849"/>
-      <point x="139" y="708" type="curve" smooth="yes"/>
-      <point x="132" y="685"/>
-      <point x="168" y="612"/>
-      <point x="202" y="685" type="curve" smooth="yes"/>
-      <point x="239" y="763"/>
-      <point x="304" y="843"/>
-      <point x="447" y="883" type="curve" smooth="yes"/>
-      <point x="646" y="939"/>
-      <point x="660" y="1035"/>
-      <point x="739" y="1035" type="curve" smooth="yes"/>
-      <point x="781" y="1035"/>
-      <point x="807" y="960"/>
-      <point x="868" y="960" type="curve" smooth="yes"/>
-      <point x="897" y="960"/>
-      <point x="949" y="1326"/>
-    </contour>
-    <contour>
-      <point x="1239" y="1089" type="curve" smooth="yes"/>
-      <point x="1476" y="1089"/>
-      <point x="1572" y="1565"/>
-      <point x="1572" y="1778" type="curve" smooth="yes"/>
-      <point x="1572" y="1792"/>
-      <point x="1535" y="1813"/>
-      <point x="1534" y="1800" type="curve" smooth="yes"/>
-      <point x="1526" y="1661"/>
-      <point x="1426" y="1440"/>
-      <point x="1293" y="1440" type="curve" smooth="yes"/>
-      <point x="1213" y="1440"/>
-      <point x="1183" y="1583"/>
-      <point x="1144" y="1583" type="curve" smooth="yes"/>
-      <point x="1064" y="1583"/>
-      <point x="1029" y="1326"/>
-      <point x="924" y="1326" type="curve" smooth="yes"/>
-      <point x="874" y="1326"/>
-      <point x="832" y="960"/>
-      <point x="868" y="960" type="curve" smooth="yes"/>
-      <point x="961" y="960"/>
-      <point x="1016" y="1200"/>
-      <point x="1075" y="1200" type="curve" smooth="yes"/>
-      <point x="1112" y="1200"/>
-      <point x="1159" y="1089"/>
-    </contour>
-    <contour>
-      <point x="3042" y="1136" type="curve" smooth="yes"/>
-      <point x="2980" y="1136"/>
-      <point x="2858" y="612"/>
-      <point x="2901" y="598" type="curve" smooth="yes"/>
-      <point x="2964" y="578"/>
-      <point x="3212" y="533"/>
-      <point x="3212" y="394" type="curve" smooth="yes"/>
-      <point x="3212" y="313"/>
-      <point x="2638" y="67"/>
-      <point x="2610" y="53" type="curve"/>
-      <point x="2591" y="42"/>
-      <point x="2613" y="-6"/>
-      <point x="2634" y="-4" type="curve" smooth="yes"/>
-      <point x="2688" y="3"/>
-      <point x="3144" y="41"/>
-      <point x="3205" y="105" type="curve" smooth="yes"/>
-      <point x="3263" y="166"/>
-      <point x="3393" y="484"/>
-      <point x="3393" y="782" type="curve" smooth="yes"/>
-      <point x="3393" y="998"/>
-      <point x="3162" y="1136"/>
-    </contour>
-    <contour>
-      <point x="3184" y="1590" type="curve" smooth="yes"/>
-      <point x="3184" y="1604"/>
-      <point x="3134" y="1626"/>
-      <point x="3069" y="1691" type="curve" smooth="yes"/>
-      <point x="3004" y="1756"/>
-      <point x="2981" y="1817"/>
-      <point x="2967" y="1817" type="curve" smooth="yes"/>
-      <point x="2933" y="1817"/>
-      <point x="2752" y="1626"/>
-      <point x="2752" y="1590" type="curve" smooth="yes"/>
-      <point x="2752" y="1547"/>
-      <point x="2936" y="1372"/>
-      <point x="2979" y="1372" type="curve" smooth="yes"/>
-      <point x="3012" y="1372"/>
-      <point x="3185" y="1554"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
deleted file mode 100644
index d2de5b1f7..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh.draft" format="2">
-  <anchor x="615" y="1792" name="mUpper"/>
-  <anchor x="1475" y="290" name="n1Lower"/>
-  <anchor x="1423" y="1601" name="nUpper"/>
-  <anchor x="600" y="861" name="tahUpper"/>
-  <outline>
-    <contour>
-      <point x="2547" y="1544" type="curve" smooth="yes"/>
-      <point x="2547" y="1428"/>
-      <point x="2442" y="1400"/>
-      <point x="2379" y="1400" type="curve" smooth="yes"/>
-      <point x="2332" y="1400"/>
-      <point x="2294" y="1406"/>
-      <point x="2250" y="1419" type="curve" smooth="yes"/>
-      <point x="2213" y="1430"/>
-      <point x="2213" y="1204"/>
-      <point x="2250" y="1193" type="curve" smooth="yes"/>
-      <point x="2463" y="1130"/>
-      <point x="2644" y="1401"/>
-      <point x="2644" y="1687" type="curve" smooth="yes"/>
-      <point x="2644" y="1869"/>
-      <point x="2579" y="2105"/>
-      <point x="2431" y="2105" type="curve" smooth="yes"/>
-      <point x="2377" y="2105"/>
-      <point x="2313" y="2094"/>
-      <point x="2255" y="1878" type="curve" smooth="yes"/>
-      <point x="2166" y="1546"/>
-      <point x="2290" y="1483"/>
-      <point x="2523" y="1571" type="curve" smooth="yes"/>
-      <point x="2540" y="1578"/>
-      <point x="2547" y="1563"/>
-    </contour>
-    <contour>
-      <point x="1423" y="1078" type="curve"/>
-      <point x="1421" y="1083"/>
-      <point x="1398" y="938"/>
-      <point x="1400" y="935" type="curve" smooth="yes"/>
-      <point x="1800" y="289"/>
-      <point x="1911" y="1274"/>
-      <point x="2250" y="1123" type="curve" smooth="yes"/>
-      <point x="2313" y="1095"/>
-      <point x="2306" y="1423"/>
-      <point x="2250" y="1449" type="curve" smooth="yes"/>
-      <point x="1911" y="1608"/>
-      <point x="1881" y="368"/>
-    </contour>
-    <contour>
-      <point x="2354" y="2215" type="curve" smooth="yes"/>
-      <point x="2303" y="2215"/>
-      <point x="2201" y="2174"/>
-      <point x="2148" y="1976" type="curve" smooth="yes"/>
-      <point x="2032" y="1544"/>
-      <point x="2162" y="1431"/>
-      <point x="2549" y="1591" type="curve" smooth="yes"/>
-      <point x="2568" y="1599"/>
-      <point x="2573" y="1583"/>
-      <point x="2573" y="1564" type="curve" smooth="yes"/>
-      <point x="2573" y="1478"/>
-      <point x="2442" y="1430"/>
-      <point x="2379" y="1430" type="curve" smooth="yes"/>
-      <point x="2332" y="1430"/>
-      <point x="2294" y="1436"/>
-      <point x="2250" y="1449" type="curve" smooth="yes"/>
-      <point x="2192" y="1466"/>
-      <point x="2192" y="1140"/>
-      <point x="2250" y="1123" type="curve" smooth="yes"/>
-      <point x="2463" y="1060"/>
-      <point x="2664" y="1380"/>
-      <point x="2664" y="1717" type="curve" smooth="yes"/>
-      <point x="2664" y="1927"/>
-      <point x="2579" y="2215"/>
-    </contour>
-    <contour>
-      <point x="555" y="1271" type="curve" smooth="yes"/>
-      <point x="545" y="1095"/>
-      <point x="593" y="860"/>
-      <point x="419" y="737" type="curve" smooth="yes"/>
-      <point x="413" y="732"/>
-      <point x="469" y="721"/>
-      <point x="478" y="728" type="curve" smooth="yes"/>
-      <point x="665" y="860"/>
-      <point x="651" y="1112"/>
-      <point x="651" y="1305" type="curve" smooth="yes"/>
-      <point x="650" y="1367"/>
-      <point x="653" y="1385"/>
-      <point x="656" y="1398" type="curve" smooth="yes"/>
-      <point x="657" y="1405"/>
-      <point x="643" y="1431"/>
-      <point x="634" y="1422" type="curve" smooth="yes"/>
-      <point x="618" y="1404"/>
-      <point x="558" y="1338"/>
-    </contour>
-    <contour>
-      <point x="614" y="726" type="curve" smooth="yes"/>
-      <point x="735" y="756"/>
-      <point x="854" y="835"/>
-      <point x="854" y="964" type="curve" smooth="yes"/>
-      <point x="854" y="1013"/>
-      <point x="814" y="1064"/>
-      <point x="763" y="1064" type="curve" smooth="yes"/>
-      <point x="632" y="1064"/>
-      <point x="572" y="873"/>
-      <point x="471" y="748" type="curve" smooth="yes"/>
-      <point x="446" y="717"/>
-      <point x="522" y="737"/>
-      <point x="532" y="755" type="curve" smooth="yes"/>
-      <point x="609" y="904"/>
-      <point x="670" y="933"/>
-      <point x="704" y="933" type="curve" smooth="yes"/>
-      <point x="722" y="933"/>
-      <point x="732" y="922"/>
-      <point x="732" y="903" type="curve" smooth="yes"/>
-      <point x="732" y="824"/>
-      <point x="626" y="799"/>
-      <point x="362" y="747" type="curve" smooth="yes"/>
-      <point x="340" y="743"/>
-      <point x="352" y="696"/>
-      <point x="366" y="696" type="curve" smooth="yes"/>
-      <point x="411" y="696"/>
-      <point x="504" y="700"/>
-    </contour>
-    <contour>
-      <point x="1770" y="1119" type="curve" smooth="yes"/>
-      <point x="1771" y="1287"/>
-      <point x="1623" y="1409"/>
-      <point x="1460" y="1409" type="curve" smooth="yes"/>
-      <point x="1292" y="1409"/>
-      <point x="1056" y="1244"/>
-      <point x="1056" y="1202" type="curve" smooth="yes"/>
-      <point x="1056" y="1190"/>
-      <point x="1065" y="1176"/>
-      <point x="1072" y="1179" type="curve" smooth="yes"/>
-      <point x="1105" y="1194"/>
-      <point x="1164" y="1204"/>
-      <point x="1196" y="1204" type="curve" smooth="yes"/>
-      <point x="1319" y="1204"/>
-      <point x="1307" y="1027"/>
-      <point x="1399" y="935" type="curve"/>
-      <point x="1289" y="916"/>
-      <point x="1157" y="850"/>
-      <point x="1016" y="707" type="curve" smooth="yes"/>
-      <point x="940" y="630"/>
-      <point x="945" y="150"/>
-      <point x="1016" y="214" type="curve" smooth="yes"/>
-      <point x="1149" y="333"/>
-      <point x="1233" y="379"/>
-      <point x="1335" y="442" type="curve" smooth="yes"/>
-      <point x="1576" y="591"/>
-      <point x="1768" y="806"/>
-    </contour>
-    <contour>
-      <point x="158" y="-697" type="curve" smooth="yes"/>
-      <point x="597" y="-488"/>
-      <point x="670" y="-93"/>
-      <point x="1016" y="214" type="curve" smooth="yes"/>
-      <point x="1079" y="270"/>
-      <point x="1082" y="773"/>
-      <point x="1016" y="707" type="curve" smooth="yes"/>
-      <point x="604" y="295"/>
-      <point x="670" y="-363"/>
-      <point x="104" y="-677" type="curve" smooth="yes"/>
-      <point x="86" y="-687"/>
-      <point x="137" y="-707"/>
-    </contour>
-    <contour>
-      <point x="2388" y="2528" type="curve" smooth="yes"/>
-      <point x="2388" y="2542"/>
-      <point x="2338" y="2565"/>
-      <point x="2273" y="2629" type="curve" smooth="yes"/>
-      <point x="2208" y="2695"/>
-      <point x="2185" y="2755"/>
-      <point x="2171" y="2755" type="curve" smooth="yes"/>
-      <point x="2137" y="2755"/>
-      <point x="1966" y="2564"/>
-      <point x="1966" y="2528" type="curve" smooth="yes"/>
-      <point x="1966" y="2486"/>
-      <point x="2140" y="2311"/>
-      <point x="2183" y="2311" type="curve" smooth="yes"/>
-      <point x="2216" y="2311"/>
-      <point x="2389" y="2493"/>
-    </contour>
-    <contour>
-      <point x="2695" y="2563" type="curve" smooth="yes"/>
-      <point x="2695" y="2577"/>
-      <point x="2645" y="2599"/>
-      <point x="2581" y="2664" type="curve" smooth="yes"/>
-      <point x="2515" y="2729"/>
-      <point x="2492" y="2780"/>
-      <point x="2479" y="2780" type="curve" smooth="yes"/>
-      <point x="2444" y="2780"/>
-      <point x="2273" y="2599"/>
-      <point x="2273" y="2563" type="curve" smooth="yes"/>
-      <point x="2273" y="2520"/>
-      <point x="2448" y="2345"/>
-      <point x="2490" y="2345" type="curve" smooth="yes"/>
-      <point x="2523" y="2345"/>
-      <point x="2696" y="2527"/>
-    </contour>
-    <contour>
-      <point x="2006" y="1785" type="curve" smooth="yes"/>
-      <point x="2006" y="1799"/>
-      <point x="1956" y="1821"/>
-      <point x="1891" y="1886" type="curve" smooth="yes"/>
-      <point x="1826" y="1951"/>
-      <point x="1803" y="2012"/>
-      <point x="1789" y="2012" type="curve" smooth="yes"/>
-      <point x="1755" y="2012"/>
-      <point x="1574" y="1821"/>
-      <point x="1574" y="1785" type="curve" smooth="yes"/>
-      <point x="1574" y="1742"/>
-      <point x="1758" y="1567"/>
-      <point x="1801" y="1567" type="curve" smooth="yes"/>
-      <point x="1834" y="1567"/>
-      <point x="2007" y="1749"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
deleted file mode 100644
index 70ca8faa1..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh" format="2">
-  <outline>
-    <contour>
-      <point x="2602" y="2869" type="curve" smooth="yes"/>
-      <point x="2602" y="2883"/>
-      <point x="2552" y="2906"/>
-      <point x="2487" y="2970" type="curve" smooth="yes"/>
-      <point x="2422" y="3036"/>
-      <point x="2399" y="3096"/>
-      <point x="2385" y="3096" type="curve" smooth="yes"/>
-      <point x="2351" y="3096"/>
-      <point x="2180" y="2905"/>
-      <point x="2180" y="2869" type="curve" smooth="yes"/>
-      <point x="2180" y="2827"/>
-      <point x="2354" y="2652"/>
-      <point x="2397" y="2652" type="curve" smooth="yes"/>
-      <point x="2430" y="2652"/>
-      <point x="2603" y="2834"/>
-    </contour>
-    <contour>
-      <point x="2909" y="2904" type="curve" smooth="yes"/>
-      <point x="2909" y="2918"/>
-      <point x="2859" y="2940"/>
-      <point x="2795" y="3005" type="curve" smooth="yes"/>
-      <point x="2729" y="3070"/>
-      <point x="2706" y="3121"/>
-      <point x="2693" y="3121" type="curve" smooth="yes"/>
-      <point x="2658" y="3121"/>
-      <point x="2487" y="2940"/>
-      <point x="2487" y="2904" type="curve" smooth="yes"/>
-      <point x="2487" y="2861"/>
-      <point x="2662" y="2686"/>
-      <point x="2704" y="2686" type="curve" smooth="yes"/>
-      <point x="2737" y="2686"/>
-      <point x="2910" y="2868"/>
-    </contour>
-    <contour>
-      <point x="2073" y="2020" type="curve" smooth="yes"/>
-      <point x="2073" y="2034"/>
-      <point x="2023" y="2056"/>
-      <point x="1958" y="2121" type="curve" smooth="yes"/>
-      <point x="1893" y="2186"/>
-      <point x="1870" y="2247"/>
-      <point x="1856" y="2247" type="curve" smooth="yes"/>
-      <point x="1822" y="2247"/>
-      <point x="1641" y="2056"/>
-      <point x="1641" y="2020" type="curve" smooth="yes"/>
-      <point x="1641" y="1977"/>
-      <point x="1825" y="1802"/>
-      <point x="1868" y="1802" type="curve" smooth="yes"/>
-      <point x="1901" y="1802"/>
-      <point x="2074" y="1984"/>
-    </contour>
-    <contour>
-      <point x="1020" y="806" type="curve" smooth="yes"/>
-      <point x="608" y="394"/>
-      <point x="674" y="-264"/>
-      <point x="108" y="-578" type="curve" smooth="yes"/>
-      <point x="90" y="-588"/>
-      <point x="141" y="-608"/>
-      <point x="162" y="-598" type="curve" smooth="yes"/>
-      <point x="601" y="-389"/>
-      <point x="730" y="55"/>
-      <point x="1020" y="313" type="curve" smooth="yes"/>
-      <point x="1083" y="369"/>
-      <point x="1086" y="872"/>
-    </contour>
-    <contour>
-      <point x="1010" y="302" type="curve" smooth="yes"/>
-      <point x="1143" y="421"/>
-      <point x="1233" y="480"/>
-      <point x="1329" y="532" type="curve" smooth="yes"/>
-      <point x="1541" y="648"/>
-      <point x="1704" y="939"/>
-      <point x="1704" y="1347" type="curve" smooth="yes"/>
-      <point x="1704" y="1411"/>
-      <point x="1393" y="1093"/>
-      <point x="1393" y="1003" type="curve"/>
-      <point x="1263" y="984"/>
-      <point x="1176" y="962"/>
-      <point x="1010" y="795" type="curve" smooth="yes"/>
-      <point x="977" y="761"/>
-      <point x="961" y="257"/>
-    </contour>
-    <contour>
-      <point x="1393" y="1003" type="curve"/>
-      <point x="1393" y="924"/>
-      <point x="1704" y="1272"/>
-      <point x="1704" y="1347" type="curve" smooth="yes"/>
-      <point x="1704" y="1441"/>
-      <point x="1650" y="1607"/>
-      <point x="1504" y="1607" type="curve" smooth="yes"/>
-      <point x="1256" y="1607"/>
-      <point x="970" y="1422"/>
-      <point x="970" y="1350" type="curve" smooth="yes"/>
-      <point x="970" y="1338"/>
-      <point x="979" y="1324"/>
-      <point x="986" y="1327" type="curve" smooth="yes"/>
-      <point x="1019" y="1342"/>
-      <point x="1078" y="1352"/>
-      <point x="1110" y="1352" type="curve" smooth="yes"/>
-      <point x="1233" y="1352"/>
-      <point x="1301" y="1095"/>
-    </contour>
-    <contour>
-      <point x="2277" y="1616" type="curve" smooth="yes"/>
-      <point x="1957" y="1711"/>
-      <point x="1893" y="609"/>
-      <point x="1450" y="1095" type="curve" smooth="yes"/>
-      <point x="1429" y="1118"/>
-      <point x="1415" y="966"/>
-      <point x="1427" y="952" type="curve" smooth="yes"/>
-      <point x="1751" y="587"/>
-      <point x="2060" y="1297"/>
-      <point x="2277" y="1233" type="curve" smooth="yes"/>
-      <point x="2344" y="1213"/>
-      <point x="2344" y="1596"/>
-    </contour>
-    <contour>
-      <point x="2796" y="1818" type="curve" smooth="yes"/>
-      <point x="2796" y="1672"/>
-      <point x="2663" y="1579"/>
-      <point x="2540" y="1579" type="curve" smooth="yes"/>
-      <point x="2483" y="1579"/>
-      <point x="2418" y="1584"/>
-      <point x="2279" y="1625" type="curve" smooth="yes"/>
-      <point x="2242" y="1636"/>
-      <point x="2243" y="1253"/>
-      <point x="2279" y="1242" type="curve" smooth="yes"/>
-      <point x="2317" y="1230"/>
-      <point x="2436" y="1203"/>
-      <point x="2472" y="1203" type="curve" smooth="yes"/>
-      <point x="2695" y="1200"/>
-      <point x="2893" y="1607"/>
-      <point x="2893" y="1951" type="curve" smooth="yes"/>
-      <point x="2893" y="2171"/>
-      <point x="2788" y="2579"/>
-      <point x="2563" y="2579" type="curve" smooth="yes"/>
-      <point x="2472" y="2579"/>
-      <point x="2379" y="2486"/>
-      <point x="2310" y="2260" type="curve" smooth="yes"/>
-      <point x="2180" y="1832"/>
-      <point x="2349" y="1657"/>
-      <point x="2772" y="1845" type="curve" smooth="yes"/>
-      <point x="2791" y="1853"/>
-      <point x="2796" y="1837"/>
-    </contour>
-    <contour>
-      <point x="393" y="1453" type="curve" smooth="yes"/>
-      <point x="383" y="1277"/>
-      <point x="431" y="1052"/>
-      <point x="257" y="929" type="curve"/>
-      <point x="251" y="924"/>
-      <point x="307" y="913"/>
-      <point x="316" y="920" type="curve" smooth="yes"/>
-      <point x="503" y="1052"/>
-      <point x="489" y="1304"/>
-      <point x="489" y="1497" type="curve" smooth="yes"/>
-      <point x="488" y="1559"/>
-      <point x="506" y="1577"/>
-      <point x="509" y="1590" type="curve"/>
-      <point x="510" y="1597"/>
-      <point x="496" y="1623"/>
-      <point x="487" y="1614" type="curve"/>
-      <point x="471" y="1596"/>
-      <point x="397" y="1530"/>
-    </contour>
-    <contour>
-      <point x="452" y="918" type="curve" smooth="yes"/>
-      <point x="573" y="948"/>
-      <point x="692" y="1027"/>
-      <point x="692" y="1156" type="curve" smooth="yes"/>
-      <point x="692" y="1225"/>
-      <point x="652" y="1256"/>
-      <point x="601" y="1256" type="curve" smooth="yes"/>
-      <point x="470" y="1256"/>
-      <point x="410" y="1065"/>
-      <point x="309" y="940" type="curve" smooth="yes"/>
-      <point x="284" y="909"/>
-      <point x="360" y="929"/>
-      <point x="370" y="947" type="curve" smooth="yes"/>
-      <point x="447" y="1096"/>
-      <point x="508" y="1125"/>
-      <point x="542" y="1125" type="curve" smooth="yes"/>
-      <point x="560" y="1125"/>
-      <point x="570" y="1114"/>
-      <point x="570" y="1095" type="curve" smooth="yes"/>
-      <point x="570" y="1016"/>
-      <point x="464" y="991"/>
-      <point x="200" y="939" type="curve" smooth="yes"/>
-      <point x="178" y="935"/>
-      <point x="190" y="888"/>
-      <point x="204" y="888" type="curve" smooth="yes"/>
-      <point x="249" y="888"/>
-      <point x="342" y="892"/>
-    </contour>
-    <contour>
-      <point x="1296" y="1805" type="curve" smooth="yes"/>
-      <point x="1424" y="1892"/>
-      <point x="1492" y="1994"/>
-      <point x="1492" y="2081" type="curve" smooth="yes"/>
-      <point x="1492" y="2099"/>
-      <point x="1469" y="2131"/>
-      <point x="1457" y="2110" type="curve"/>
-      <point x="1425" y="2060"/>
-      <point x="1415" y="2040"/>
-      <point x="1296" y="1959" type="curve" smooth="yes"/>
-      <point x="1169" y="1872"/>
-      <point x="1099" y="1771"/>
-      <point x="1099" y="1684" type="curve" smooth="yes"/>
-      <point x="1099" y="1667"/>
-      <point x="1122" y="1634"/>
-      <point x="1135" y="1655" type="curve" smooth="yes"/>
-      <point x="1166" y="1706"/>
-      <point x="1177" y="1724"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testG_afS_eenH_ehdo.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testG_afS_eenH_ehdo.glif
deleted file mode 100644
index 7ceef35c7..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testG_afS_eenH_ehdo.glif
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testGafSeenHehdo" format="2">
-  <outline>
-    <contour>
-      <point x="1593" y="1812" type="curve" smooth="yes"/>
-      <point x="1593" y="1825"/>
-      <point x="1542" y="1848"/>
-      <point x="1478" y="1912" type="curve" smooth="yes"/>
-      <point x="1412" y="1978"/>
-      <point x="1390" y="2028"/>
-      <point x="1376" y="2028" type="curve" smooth="yes"/>
-      <point x="1341" y="2028"/>
-      <point x="1171" y="1847"/>
-      <point x="1171" y="1812" type="curve" smooth="yes"/>
-      <point x="1171" y="1769"/>
-      <point x="1345" y="1594"/>
-      <point x="1387" y="1594" type="curve" smooth="yes"/>
-      <point x="1421" y="1594"/>
-      <point x="1594" y="1776"/>
-    </contour>
-    <contour>
-      <point x="1946" y="1837" type="curve" smooth="yes"/>
-      <point x="1946" y="1851"/>
-      <point x="1895" y="1873"/>
-      <point x="1831" y="1938" type="curve" smooth="yes"/>
-      <point x="1765" y="2003"/>
-      <point x="1743" y="2054"/>
-      <point x="1729" y="2054" type="curve" smooth="yes"/>
-      <point x="1694" y="2054"/>
-      <point x="1524" y="1873"/>
-      <point x="1524" y="1837" type="curve" smooth="yes"/>
-      <point x="1524" y="1794"/>
-      <point x="1698" y="1619"/>
-      <point x="1740" y="1619" type="curve" smooth="yes"/>
-      <point x="1774" y="1619"/>
-      <point x="1947" y="1801"/>
-    </contour>
-    <contour>
-      <point x="1747" y="2200" type="curve" smooth="yes"/>
-      <point x="1747" y="2214"/>
-      <point x="1696" y="2237"/>
-      <point x="1632" y="2301" type="curve" smooth="yes"/>
-      <point x="1566" y="2367"/>
-      <point x="1544" y="2417"/>
-      <point x="1530" y="2417" type="curve" smooth="yes"/>
-      <point x="1496" y="2417"/>
-      <point x="1325" y="2236"/>
-      <point x="1325" y="2200" type="curve" smooth="yes"/>
-      <point x="1325" y="2158"/>
-      <point x="1499" y="1983"/>
-      <point x="1542" y="1983" type="curve" smooth="yes"/>
-      <point x="1575" y="1983"/>
-      <point x="1748" y="2165"/>
-    </contour>
-    <contour>
-      <point x="494" y="906" type="curve" smooth="yes"/>
-      <point x="83" y="904"/>
-      <point x="213" y="206"/>
-      <point x="49" y="96" type="curve" smooth="yes"/>
-      <point x="9" y="69"/>
-      <point x="157" y="132"/>
-      <point x="171" y="164" type="curve" smooth="yes"/>
-      <point x="237" y="309"/>
-      <point x="212" y="598"/>
-      <point x="419" y="598" type="curve" smooth="yes"/>
-      <point x="496" y="598"/>
-      <point x="562" y="502"/>
-      <point x="497" y="437" type="curve" smooth="yes"/>
-      <point x="470" y="410"/>
-      <point x="709" y="556"/>
-      <point x="721" y="579" type="curve" smooth="yes"/>
-      <point x="757" y="653"/>
-      <point x="709" y="907"/>
-    </contour>
-    <contour>
-      <point x="929" y="775" type="curve" smooth="yes"/>
-      <point x="677" y="775"/>
-      <point x="435" y="182"/>
-      <point x="-94" y="47" type="curve" smooth="yes"/>
-      <point x="-114" y="41"/>
-      <point x="-76" y="-10"/>
-      <point x="-63" y="-7" type="curve" smooth="yes"/>
-      <point x="504" y="136"/>
-      <point x="574" y="512"/>
-      <point x="777" y="512" type="curve" smooth="yes"/>
-      <point x="819" y="512"/>
-      <point x="853" y="471"/>
-      <point x="853" y="422" type="curve" smooth="yes"/>
-      <point x="853" y="304"/>
-      <point x="710" y="184"/>
-      <point x="307" y="172" type="curve" smooth="yes"/>
-      <point x="271" y="171"/>
-      <point x="127" y="97"/>
-      <point x="160" y="97" type="curve" smooth="yes"/>
-      <point x="626" y="97"/>
-      <point x="1129" y="168"/>
-      <point x="1129" y="564" type="curve" smooth="yes"/>
-      <point x="1129" y="658"/>
-      <point x="1045" y="775"/>
-    </contour>
-    <contour>
-      <point x="1126" y="896" type="curve" smooth="yes"/>
-      <point x="1216" y="896"/>
-      <point x="1273" y="744"/>
-      <point x="1371" y="744" type="curve" smooth="yes"/>
-      <point x="1414" y="744"/>
-      <point x="1460" y="1110"/>
-      <point x="1427" y="1110" type="curve" smooth="yes"/>
-      <point x="1390" y="1110"/>
-      <point x="1315" y="1199"/>
-      <point x="1239" y="1199" type="curve" smooth="yes"/>
-      <point x="1007" y="1199"/>
-      <point x="809" y="880"/>
-      <point x="679" y="686" type="curve" smooth="yes"/>
-      <point x="676" y="681"/>
-      <point x="736" y="624"/>
-      <point x="745" y="634" type="curve" smooth="yes"/>
-      <point x="943" y="854"/>
-      <point x="1045" y="896"/>
-    </contour>
-    <contour>
-      <point x="1371" y="744" type="curve" smooth="yes"/>
-      <point x="1464" y="744"/>
-      <point x="1519" y="984"/>
-      <point x="1578" y="984" type="curve" smooth="yes"/>
-      <point x="1615" y="984"/>
-      <point x="1662" y="873"/>
-      <point x="1742" y="873" type="curve" smooth="yes"/>
-      <point x="1851" y="873"/>
-      <point x="1905" y="1122"/>
-      <point x="1950" y="1122" type="curve" smooth="yes"/>
-      <point x="1995" y="1122"/>
-      <point x="2053" y="1002"/>
-      <point x="2155" y="1002" type="curve" smooth="yes"/>
-      <point x="2213" y="1002"/>
-      <point x="2248" y="1352"/>
-      <point x="2155" y="1352" type="curve" smooth="yes"/>
-      <point x="2078" y="1352"/>
-      <point x="2063" y="1504"/>
-      <point x="2014" y="1504" type="curve" smooth="yes"/>
-      <point x="1934" y="1504"/>
-      <point x="1905" y="1224"/>
-      <point x="1796" y="1224" type="curve" smooth="yes"/>
-      <point x="1716" y="1224"/>
-      <point x="1686" y="1367"/>
-      <point x="1647" y="1367" type="curve" smooth="yes"/>
-      <point x="1567" y="1367"/>
-      <point x="1532" y="1110"/>
-      <point x="1427" y="1110" type="curve" smooth="yes"/>
-      <point x="1391" y="1110"/>
-      <point x="1315" y="744"/>
-    </contour>
-    <contour>
-      <point x="2535" y="2029" type="curve" smooth="yes"/>
-      <point x="2542" y="2242"/>
-      <point x="2607" y="2308"/>
-      <point x="2979" y="2575" type="curve" smooth="yes"/>
-      <point x="3346" y="2838"/>
-      <point x="3467" y="3010"/>
-      <point x="3482" y="3254" type="curve" smooth="yes"/>
-      <point x="3483" y="3272"/>
-      <point x="3455" y="3294"/>
-      <point x="3446" y="3279" type="curve" smooth="yes"/>
-      <point x="3361" y="3141"/>
-      <point x="3255" y="3041"/>
-      <point x="2981" y="2840" type="curve" smooth="yes"/>
-      <point x="2655" y="2601"/>
-      <point x="2347" y="2165"/>
-      <point x="2347" y="1652" type="curve" smooth="yes"/>
-      <point x="2347" y="1421"/>
-      <point x="2309" y="1353"/>
-      <point x="2161" y="1353" type="curve" smooth="yes"/>
-      <point x="2121" y="1353"/>
-      <point x="2121" y="1003"/>
-      <point x="2161" y="1003" type="curve" smooth="yes"/>
-      <point x="2233" y="1003"/>
-      <point x="2351" y="1231"/>
-      <point x="2398" y="1343" type="curve" smooth="yes"/>
-      <point x="2506" y="1600"/>
-      <point x="2528" y="1797"/>
-    </contour>
-    <contour>
-      <point x="2767" y="3112" type="curve" smooth="yes"/>
-      <point x="2453" y="2872"/>
-      <point x="2383" y="2751"/>
-      <point x="2372" y="2538" type="curve" smooth="yes"/>
-      <point x="2371" y="2519"/>
-      <point x="2399" y="2497"/>
-      <point x="2408" y="2512" type="curve" smooth="yes"/>
-      <point x="2484" y="2636"/>
-      <point x="2550" y="2683"/>
-      <point x="2812" y="2885" type="curve" smooth="yes"/>
-      <point x="3083" y="3094"/>
-      <point x="3132" y="3262"/>
-      <point x="3146" y="3425" type="curve" smooth="yes"/>
-      <point x="3147" y="3443"/>
-      <point x="3120" y="3465"/>
-      <point x="3111" y="3450" type="curve" smooth="yes"/>
-      <point x="3037" y="3331"/>
-      <point x="2992" y="3284"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
deleted file mode 100644
index c19860425..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehdoDalHehdoAinJeem" format="2">
-  <outline>
-    <contour>
-      <point x="2134" y="-22" type="curve" smooth="yes"/>
-      <point x="2415" y="-22"/>
-      <point x="2665" y="612"/>
-      <point x="2665" y="704" type="curve" smooth="yes"/>
-      <point x="2665" y="795"/>
-      <point x="2634" y="992"/>
-      <point x="2459" y="992" type="curve" smooth="yes"/>
-      <point x="2279" y="992"/>
-      <point x="2181" y="712"/>
-      <point x="2181" y="520" type="curve" smooth="yes"/>
-      <point x="2181" y="404"/>
-      <point x="2271" y="230"/>
-      <point x="2462" y="230" type="curve" smooth="yes"/>
-      <point x="2630" y="230"/>
-      <point x="2955" y="343"/>
-      <point x="2955" y="596" type="curve" smooth="yes"/>
-      <point x="2955" y="855"/>
-      <point x="2531" y="914"/>
-      <point x="2487" y="1058" type="curve" smooth="yes"/>
-      <point x="2480" y="1080"/>
-      <point x="2446" y="1085"/>
-      <point x="2438" y="1064" type="curve" smooth="yes"/>
-      <point x="2421" y="1023"/>
-      <point x="2401" y="822"/>
-      <point x="2416" y="794" type="curve" smooth="yes"/>
-      <point x="2444" y="737"/>
-      <point x="2899" y="657"/>
-      <point x="2871" y="551" type="curve" smooth="yes"/>
-      <point x="2862" y="517"/>
-      <point x="2690" y="489"/>
-      <point x="2528" y="489" type="curve" smooth="yes"/>
-      <point x="2427" y="489"/>
-      <point x="2271" y="539"/>
-      <point x="2271" y="618" type="curve" smooth="yes"/>
-      <point x="2271" y="688"/>
-      <point x="2390" y="718"/>
-      <point x="2451" y="718" type="curve" smooth="yes"/>
-      <point x="2512" y="718"/>
-      <point x="2569" y="697"/>
-      <point x="2569" y="627" type="curve" smooth="yes"/>
-      <point x="2569" y="527"/>
-      <point x="2344" y="440"/>
-      <point x="2235" y="440" type="curve" smooth="yes"/>
-      <point x="2069" y="440"/>
-      <point x="1972" y="532"/>
-      <point x="1961" y="786" type="curve" smooth="yes"/>
-      <point x="1958" y="856"/>
-      <point x="1830" y="716"/>
-      <point x="1836" y="626" type="curve" smooth="yes"/>
-      <point x="1858" y="301"/>
-      <point x="1946" y="-22"/>
-    </contour>
-    <contour>
-      <point x="2032" y="1009" type="curve" smooth="yes"/>
-      <point x="2035" y="1024"/>
-      <point x="1975" y="1031"/>
-      <point x="1971" y="1012" type="curve" smooth="yes"/>
-      <point x="1889" y="623"/>
-      <point x="1558" y="244"/>
-      <point x="1258" y="94" type="curve" smooth="yes"/>
-      <point x="1238" y="84"/>
-      <point x="1262" y="34"/>
-      <point x="1284" y="34" type="curve" smooth="yes"/>
-      <point x="1347" y="35"/>
-      <point x="1802" y="104"/>
-      <point x="1850" y="152" type="curve" smooth="yes"/>
-      <point x="1903" y="206"/>
-      <point x="1941" y="422"/>
-      <point x="1947" y="463" type="curve"/>
-      <point x="2041" y="330"/>
-      <point x="2023" y="707"/>
-      <point x="2016" y="832" type="curve" smooth="yes"/>
-      <point x="2013" y="875"/>
-      <point x="2022" y="965"/>
-    </contour>
-    <contour>
-      <point x="1726" y="1818" type="curve" smooth="yes"/>
-      <point x="1726" y="2077"/>
-      <point x="1302" y="2136"/>
-      <point x="1258" y="2280" type="curve" smooth="yes"/>
-      <point x="1251" y="2302"/>
-      <point x="1217" y="2307"/>
-      <point x="1209" y="2286" type="curve" smooth="yes"/>
-      <point x="1192" y="2245"/>
-      <point x="1172" y="2044"/>
-      <point x="1187" y="2016" type="curve" smooth="yes"/>
-      <point x="1215" y="1959"/>
-      <point x="1670" y="1879"/>
-      <point x="1642" y="1773" type="curve" smooth="yes"/>
-      <point x="1633" y="1739"/>
-      <point x="1461" y="1711"/>
-      <point x="1299" y="1711" type="curve" smooth="yes"/>
-      <point x="1198" y="1711"/>
-      <point x="1042" y="1761"/>
-      <point x="1042" y="1840" type="curve" smooth="yes"/>
-      <point x="1042" y="1910"/>
-      <point x="1161" y="1940"/>
-      <point x="1222" y="1940" type="curve" smooth="yes"/>
-      <point x="1283" y="1940"/>
-      <point x="1340" y="1919"/>
-      <point x="1340" y="1849" type="curve" smooth="yes"/>
-      <point x="1340" y="1622"/>
-      <point x="963" y="1002"/>
-      <point x="648" y="1341" type="curve" smooth="yes"/>
-      <point x="622" y="1369"/>
-      <point x="567" y="1218"/>
-      <point x="584" y="1200" type="curve" smooth="yes"/>
-      <point x="959" y="817"/>
-      <point x="1436" y="1584"/>
-      <point x="1436" y="1926" type="curve" smooth="yes"/>
-      <point x="1436" y="2017"/>
-      <point x="1405" y="2214"/>
-      <point x="1230" y="2214" type="curve" smooth="yes"/>
-      <point x="1050" y="2214"/>
-      <point x="952" y="1934"/>
-      <point x="952" y="1742" type="curve" smooth="yes"/>
-      <point x="952" y="1626"/>
-      <point x="1042" y="1452"/>
-      <point x="1233" y="1452" type="curve" smooth="yes"/>
-      <point x="1401" y="1452"/>
-      <point x="1726" y="1565"/>
-    </contour>
-    <contour>
-      <point x="-150" y="516" type="curve"/>
-      <point x="-130" y="516"/>
-      <point x="-90" y="533"/>
-      <point x="-80" y="553" type="curve" smooth="yes"/>
-      <point x="37" y="796"/>
-      <point x="144" y="844"/>
-      <point x="433" y="968" type="curve" smooth="yes"/>
-      <point x="696" y="1080"/>
-      <point x="859" y="1365"/>
-      <point x="859" y="1573" type="curve" smooth="yes"/>
-      <point x="859" y="1621"/>
-      <point x="548" y="1304"/>
-      <point x="548" y="1229" type="curve"/>
-      <point x="543" y="1206"/>
-      <point x="496" y="1162"/>
-      <point x="463" y="1152" type="curve" smooth="yes"/>
-      <point x="140" y="1052"/>
-      <point x="-150" y="805"/>
-    </contour>
-    <contour>
-      <point x="548" y="1229" type="curve"/>
-      <point x="548" y="1150"/>
-      <point x="859" y="1498"/>
-      <point x="859" y="1573" type="curve" smooth="yes"/>
-      <point x="859" y="1667"/>
-      <point x="805" y="1833"/>
-      <point x="659" y="1833" type="curve" smooth="yes"/>
-      <point x="411" y="1833"/>
-      <point x="125" y="1648"/>
-      <point x="125" y="1576" type="curve" smooth="yes"/>
-      <point x="125" y="1564"/>
-      <point x="134" y="1550"/>
-      <point x="141" y="1553" type="curve" smooth="yes"/>
-      <point x="174" y="1568"/>
-      <point x="233" y="1578"/>
-      <point x="265" y="1578" type="curve" smooth="yes"/>
-      <point x="388" y="1578"/>
-      <point x="456" y="1321"/>
-    </contour>
-    <contour>
-      <point x="-169" y="-261" type="curve" smooth="yes"/>
-      <point x="-169" y="120"/>
-      <point x="314" y="578"/>
-      <point x="674" y="768" type="curve" smooth="yes"/>
-      <point x="694" y="779"/>
-      <point x="672" y="937"/>
-      <point x="633" y="932" type="curve" smooth="yes"/>
-      <point x="606" y="929"/>
-      <point x="580" y="928"/>
-      <point x="552" y="928" type="curve" smooth="yes"/>
-      <point x="333" y="928"/>
-      <point x="244" y="970"/>
-      <point x="30" y="906" type="curve" smooth="yes"/>
-      <point x="-9" y="894"/>
-      <point x="-153" y="600"/>
-      <point x="-153" y="520" type="curve" smooth="yes"/>
-      <point x="-153" y="507"/>
-      <point x="-147" y="504"/>
-      <point x="-141" y="504" type="curve" smooth="yes"/>
-      <point x="-112" y="504"/>
-      <point x="-45" y="552"/>
-      <point x="97" y="552" type="curve" smooth="yes"/>
-      <point x="182" y="552"/>
-      <point x="200" y="531"/>
-      <point x="237" y="531" type="curve"/>
-      <point x="-131" y="293"/>
-      <point x="-307" y="-121"/>
-      <point x="-307" y="-532" type="curve" smooth="yes"/>
-      <point x="-307" y="-974"/>
-      <point x="-85" y="-1261"/>
-      <point x="232" y="-1261" type="curve" smooth="yes"/>
-      <point x="708" y="-1261"/>
-      <point x="972" y="-692"/>
-      <point x="1099" y="-206" type="curve" smooth="yes"/>
-      <point x="1110" y="-165"/>
-      <point x="1066" y="-136"/>
-      <point x="1057" y="-167" type="curve" smooth="yes"/>
-      <point x="963" y="-469"/>
-      <point x="709" y="-701"/>
-      <point x="314" y="-701" type="curve" smooth="yes"/>
-      <point x="-66" y="-701"/>
-      <point x="-169" y="-436"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
deleted file mode 100644
index 097826e7b..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehgoalSadQaf" format="2">
-  <outline>
-    <contour>
-      <point x="1513" y="660" type="curve" smooth="yes"/>
-      <point x="1513" y="477"/>
-      <point x="1278" y="-39"/>
-      <point x="702" y="-39" type="curve" smooth="yes"/>
-      <point x="250" y="-39"/>
-      <point x="183" y="468"/>
-      <point x="350" y="877" type="curve" smooth="yes"/>
-      <point x="359" y="899"/>
-      <point x="313" y="919"/>
-      <point x="303" y="899" type="curve" smooth="yes"/>
-      <point x="166" y="640"/>
-      <point x="103" y="372"/>
-      <point x="103" y="135" type="curve" smooth="yes"/>
-      <point x="104" y="-281"/>
-      <point x="301" y="-599"/>
-      <point x="634" y="-599" type="curve" smooth="yes"/>
-      <point x="1174" y="-599"/>
-      <point x="1610" y="198"/>
-      <point x="1610" y="813" type="curve" smooth="yes"/>
-      <point x="1610" y="1023"/>
-      <point x="1505" y="1421"/>
-      <point x="1280" y="1421" type="curve" smooth="yes"/>
-      <point x="1189" y="1421"/>
-      <point x="1096" y="1328"/>
-      <point x="1027" y="1102" type="curve" smooth="yes"/>
-      <point x="897" y="674"/>
-      <point x="1066" y="499"/>
-      <point x="1489" y="687" type="curve" smooth="yes"/>
-      <point x="1508" y="695"/>
-      <point x="1513" y="679"/>
-    </contour>
-    <contour>
-      <point x="1854" y="1073" type="curve" smooth="yes"/>
-      <point x="1903" y="1073"/>
-      <point x="1946" y="898"/>
-      <point x="2158" y="898" type="curve" smooth="yes"/>
-      <point x="2440" y="898"/>
-      <point x="2656" y="1398"/>
-      <point x="2656" y="1712" type="curve" smooth="yes"/>
-      <point x="2656" y="1807"/>
-      <point x="2615" y="1970"/>
-      <point x="2497" y="1970" type="curve" smooth="yes"/>
-      <point x="2223" y="1970"/>
-      <point x="1973" y="1559"/>
-      <point x="1867" y="1345" type="curve"/>
-      <point x="1867" y="1345"/>
-      <point x="1913" y="1329"/>
-      <point x="1925" y="1329" type="curve"/>
-      <point x="2051" y="1513"/>
-      <point x="2238" y="1639"/>
-      <point x="2402" y="1639" type="curve" smooth="yes"/>
-      <point x="2546" y="1639"/>
-      <point x="2582" y="1588"/>
-      <point x="2582" y="1568" type="curve" smooth="yes"/>
-      <point x="2582" y="1544"/>
-      <point x="2467" y="1422"/>
-      <point x="2069" y="1422" type="curve" smooth="yes"/>
-      <point x="1935" y="1425"/>
-      <point x="1892" y="1463"/>
-      <point x="1838" y="1462" type="curve" smooth="yes"/>
-      <point x="1766" y="1460"/>
-      <point x="1709" y="1108"/>
-      <point x="1564" y="1051" type="curve" smooth="yes"/>
-      <point x="1528" y="1037"/>
-      <point x="1535" y="688"/>
-      <point x="1564" y="711" type="curve" smooth="yes"/>
-      <point x="1694" y="814"/>
-      <point x="1824" y="1073"/>
-    </contour>
-    <contour>
-      <point x="3203" y="1891" type="curve" smooth="yes"/>
-      <point x="3027" y="1891"/>
-      <point x="2770" y="1016"/>
-      <point x="2240" y="1016" type="curve" smooth="yes"/>
-      <point x="2210" y="1016"/>
-      <point x="2131" y="912"/>
-      <point x="2146" y="912" type="curve" smooth="yes"/>
-      <point x="2714" y="912"/>
-      <point x="3071" y="1611"/>
-      <point x="3169" y="1611" type="curve" smooth="yes"/>
-      <point x="3219" y="1611"/>
-      <point x="3276" y="1489"/>
-      <point x="3331" y="1489" type="curve" smooth="yes"/>
-      <point x="3422" y="1489"/>
-      <point x="3519" y="1615"/>
-      <point x="3519" y="1802" type="curve" smooth="yes"/>
-      <point x="3519" y="1848"/>
-      <point x="3503" y="1884"/>
-      <point x="3473" y="1884" type="curve" smooth="yes"/>
-      <point x="3432" y="1884"/>
-      <point x="3391" y="1762"/>
-      <point x="3356" y="1762" type="curve" smooth="yes"/>
-      <point x="3310" y="1762"/>
-      <point x="3257" y="1891"/>
-    </contour>
-    <contour>
-      <point x="1307" y="1779" type="curve" smooth="yes"/>
-      <point x="1307" y="1793"/>
-      <point x="1257" y="1816"/>
-      <point x="1192" y="1880" type="curve" smooth="yes"/>
-      <point x="1127" y="1946"/>
-      <point x="1104" y="2006"/>
-      <point x="1090" y="2006" type="curve" smooth="yes"/>
-      <point x="1056" y="2006"/>
-      <point x="885" y="1815"/>
-      <point x="885" y="1779" type="curve" smooth="yes"/>
-      <point x="885" y="1737"/>
-      <point x="1059" y="1562"/>
-      <point x="1102" y="1562" type="curve" smooth="yes"/>
-      <point x="1135" y="1562"/>
-      <point x="1308" y="1744"/>
-    </contour>
-    <contour>
-      <point x="1614" y="1814" type="curve" smooth="yes"/>
-      <point x="1614" y="1828"/>
-      <point x="1564" y="1850"/>
-      <point x="1500" y="1915" type="curve" smooth="yes"/>
-      <point x="1434" y="1980"/>
-      <point x="1411" y="2031"/>
-      <point x="1398" y="2031" type="curve" smooth="yes"/>
-      <point x="1363" y="2031"/>
-      <point x="1192" y="1850"/>
-      <point x="1192" y="1814" type="curve" smooth="yes"/>
-      <point x="1192" y="1771"/>
-      <point x="1367" y="1596"/>
-      <point x="1409" y="1596" type="curve" smooth="yes"/>
-      <point x="1442" y="1596"/>
-      <point x="1615" y="1778"/>
-    </contour>
-    <contour>
-      <point x="3319" y="1318" type="curve" smooth="yes"/>
-      <point x="3153" y="1050"/>
-      <point x="3171" y="768"/>
-      <point x="3329" y="768" type="curve" smooth="yes"/>
-      <point x="3525" y="768"/>
-      <point x="3483" y="1055"/>
-      <point x="3428" y="1055" type="curve" smooth="yes"/>
-      <point x="3389" y="1055"/>
-      <point x="3388" y="991"/>
-      <point x="3356" y="991" type="curve" smooth="yes"/>
-      <point x="3297" y="991"/>
-      <point x="3265" y="1068"/>
-      <point x="3366" y="1302" type="curve" smooth="yes"/>
-      <point x="3370" y="1311"/>
-      <point x="3326" y="1329"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
deleted file mode 100644
index 559321c40..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw.draft" format="2">
-  <anchor x="721" y="513" name="_exit_qafWaw"/>
-  <anchor x="1108" y="1493" name="exit_lamKaf"/>
-  <anchor x="1328" y="1223" name="exit_meemAlt"/>
-  <anchor x="721" y="513" name="exit_qafWaw"/>
-  <outline>
-    <contour>
-      <point x="718" y="501" type="curve" smooth="yes"/>
-      <point x="924" y="707"/>
-      <point x="1008" y="886"/>
-      <point x="1046" y="1093" type="curve"/>
-      <point x="1062" y="1052"/>
-      <point x="1200" y="1118"/>
-      <point x="1176" y="1154" type="curve" smooth="yes"/>
-      <point x="1152" y="1190"/>
-      <point x="1112" y="1254"/>
-      <point x="1112" y="1355" type="curve" smooth="yes"/>
-      <point x="1112" y="1399"/>
-      <point x="1112" y="1445"/>
-      <point x="1112" y="1492" type="curve" smooth="yes"/>
-      <point x="1112" y="1648"/>
-      <point x="1112" y="1774"/>
-      <point x="1121" y="1999" type="curve" smooth="yes"/>
-      <point x="1127" y="2151"/>
-      <point x="1151" y="2196"/>
-      <point x="1159" y="2225" type="curve" smooth="yes"/>
-      <point x="1164" y="2243"/>
-      <point x="1146" y="2292"/>
-      <point x="1126" y="2270" type="curve" smooth="yes"/>
-      <point x="1086" y="2226"/>
-      <point x="968" y="2067"/>
-      <point x="958" y="1901" type="curve" smooth="yes"/>
-      <point x="940" y="1590"/>
-      <point x="952" y="1421"/>
-      <point x="950" y="1197" type="curve" smooth="yes"/>
-      <point x="948" y="1012"/>
-      <point x="882" y="851"/>
-      <point x="718" y="722" type="curve" smooth="yes"/>
-      <point x="655" y="672"/>
-      <point x="673" y="456"/>
-    </contour>
-    <contour>
-      <point x="128" y="-9" type="curve" smooth="yes"/>
-      <point x="223" y="-5"/>
-      <point x="541" y="14"/>
-      <point x="571" y="44" type="curve" smooth="yes"/>
-      <point x="619" y="92"/>
-      <point x="777" y="365"/>
-      <point x="777" y="594" type="curve" smooth="yes"/>
-      <point x="777" y="804"/>
-      <point x="692" y="1092"/>
-      <point x="467" y="1092" type="curve" smooth="yes"/>
-      <point x="416" y="1092"/>
-      <point x="314" y="1051"/>
-      <point x="261" y="853" type="curve" smooth="yes"/>
-      <point x="145" y="421"/>
-      <point x="275" y="308"/>
-      <point x="662" y="468" type="curve" smooth="yes"/>
-      <point x="681" y="476"/>
-      <point x="686" y="460"/>
-      <point x="686" y="441" type="curve" smooth="yes"/>
-      <point x="686" y="305"/>
-      <point x="264" y="103"/>
-      <point x="110" y="40" type="curve" smooth="yes"/>
-      <point x="88" y="31"/>
-      <point x="106" y="-10"/>
-    </contour>
-    <contour>
-      <point x="1403" y="532" type="curve" smooth="yes"/>
-      <point x="1679" y="532"/>
-      <point x="1827" y="931"/>
-      <point x="1827" y="1112" type="curve" smooth="yes"/>
-      <point x="1827" y="1231"/>
-      <point x="1601" y="1199"/>
-      <point x="1563" y="1199" type="curve" smooth="yes"/>
-      <point x="1498" y="1199"/>
-      <point x="1425" y="1172"/>
-      <point x="1415" y="1254" type="curve" smooth="yes"/>
-      <point x="1414" y="1268"/>
-      <point x="1342" y="1271"/>
-      <point x="1340" y="1253" type="curve" smooth="yes"/>
-      <point x="1337" y="1231"/>
-      <point x="1330" y="1152"/>
-      <point x="1370" y="1092" type="curve"/>
-      <point x="1202" y="1092"/>
-      <point x="1128" y="1214"/>
-      <point x="1112" y="1492" type="curve" smooth="yes"/>
-      <point x="1107" y="1575"/>
-      <point x="995" y="1361"/>
-      <point x="1001" y="1282" type="curve" smooth="yes"/>
-      <point x="1031" y="888"/>
-      <point x="1104" y="532"/>
-    </contour>
-    <contour>
-      <point x="1340" y="1253" type="curve" smooth="yes"/>
-      <point x="1337" y="1231"/>
-      <point x="1416" y="1238"/>
-      <point x="1415" y="1254" type="curve" smooth="yes"/>
-      <point x="1405" y="1379"/>
-      <point x="1745" y="1471"/>
-      <point x="1941" y="1571" type="curve" smooth="yes"/>
-      <point x="2121" y="1663"/>
-      <point x="2237" y="1841"/>
-      <point x="2237" y="2007" type="curve" smooth="yes"/>
-      <point x="2237" y="2093"/>
-      <point x="1964" y="2082"/>
-      <point x="1843" y="2078" type="curve" smooth="yes"/>
-      <point x="1668" y="2072"/>
-      <point x="1555" y="1922"/>
-      <point x="1460" y="1714" type="curve" smooth="yes"/>
-      <point x="1450" y="1692"/>
-      <point x="1490" y="1665"/>
-      <point x="1502" y="1686" type="curve" smooth="yes"/>
-      <point x="1563" y="1793"/>
-      <point x="1641" y="1806"/>
-      <point x="1803" y="1806" type="curve" smooth="yes"/>
-      <point x="1894" y="1806"/>
-      <point x="2091" y="1814"/>
-      <point x="2091" y="1776" type="curve" smooth="yes"/>
-      <point x="2091" y="1720"/>
-      <point x="1776" y="1639"/>
-      <point x="1627" y="1562" type="curve" smooth="yes"/>
-      <point x="1526" y="1510"/>
-      <point x="1363" y="1429"/>
-    </contour>
-    <contour>
-      <point x="2436" y="787" type="curve"/>
-      <point x="2436" y="800"/>
-      <point x="2386" y="823"/>
-      <point x="2322" y="887" type="curve" smooth="yes"/>
-      <point x="2256" y="953"/>
-      <point x="2234" y="1003"/>
-      <point x="2220" y="1003" type="curve" smooth="yes"/>
-      <point x="2185" y="1003"/>
-      <point x="2015" y="822"/>
-      <point x="2015" y="787" type="curve" smooth="yes"/>
-      <point x="2015" y="744"/>
-      <point x="2189" y="569"/>
-      <point x="2231" y="569" type="curve" smooth="yes"/>
-      <point x="2265" y="569"/>
-      <point x="2438" y="751"/>
-    </contour>
-    <contour>
-      <point x="2799" y="812" type="curve"/>
-      <point x="2799" y="826"/>
-      <point x="2739" y="848"/>
-      <point x="2675" y="913" type="curve" smooth="yes"/>
-      <point x="2609" y="978"/>
-      <point x="2587" y="1029"/>
-      <point x="2573" y="1029" type="curve" smooth="yes"/>
-      <point x="2538" y="1029"/>
-      <point x="2368" y="848"/>
-      <point x="2368" y="812" type="curve" smooth="yes"/>
-      <point x="2368" y="769"/>
-      <point x="2542" y="594"/>
-      <point x="2584" y="594" type="curve" smooth="yes"/>
-      <point x="2618" y="594"/>
-      <point x="2801" y="776"/>
-    </contour>
-    <contour>
-      <point x="2425" y="1152" type="curve" smooth="yes"/>
-      <point x="2425" y="1166"/>
-      <point x="2375" y="1189"/>
-      <point x="2310" y="1253" type="curve" smooth="yes"/>
-      <point x="2245" y="1319"/>
-      <point x="2222" y="1369"/>
-      <point x="2208" y="1369" type="curve" smooth="yes"/>
-      <point x="2174" y="1369"/>
-      <point x="2003" y="1188"/>
-      <point x="2003" y="1152" type="curve" smooth="yes"/>
-      <point x="2003" y="1110"/>
-      <point x="2177" y="935"/>
-      <point x="2220" y="935" type="curve" smooth="yes"/>
-      <point x="2253" y="935"/>
-      <point x="2426" y="1117"/>
-    </contour>
-    <contour>
-      <point x="2778" y="1178" type="curve" smooth="yes"/>
-      <point x="2778" y="1191"/>
-      <point x="2728" y="1214"/>
-      <point x="2663" y="1278" type="curve" smooth="yes"/>
-      <point x="2598" y="1344"/>
-      <point x="2575" y="1394"/>
-      <point x="2561" y="1394" type="curve" smooth="yes"/>
-      <point x="2527" y="1394"/>
-      <point x="2356" y="1213"/>
-      <point x="2356" y="1178" type="curve" smooth="yes"/>
-      <point x="2356" y="1135"/>
-      <point x="2530" y="960"/>
-      <point x="2573" y="960" type="curve" smooth="yes"/>
-      <point x="2606" y="960"/>
-      <point x="2779" y="1142"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
deleted file mode 100644
index c6269f67e..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw" format="2">
-  <anchor x="721" y="513" name="_exit_qafWaw"/>
-  <anchor x="1108" y="1493" name="exit_lamKaf"/>
-  <anchor x="1328" y="1223" name="exit_meemAlt"/>
-  <anchor x="721" y="513" name="exit_qafWaw"/>
-  <outline>
-    <contour>
-      <point x="2436" y="787" type="curve"/>
-      <point x="2436" y="800"/>
-      <point x="2386" y="823"/>
-      <point x="2322" y="887" type="curve" smooth="yes"/>
-      <point x="2256" y="953"/>
-      <point x="2234" y="1003"/>
-      <point x="2220" y="1003" type="curve" smooth="yes"/>
-      <point x="2185" y="1003"/>
-      <point x="2015" y="822"/>
-      <point x="2015" y="787" type="curve" smooth="yes"/>
-      <point x="2015" y="744"/>
-      <point x="2189" y="569"/>
-      <point x="2231" y="569" type="curve" smooth="yes"/>
-      <point x="2265" y="569"/>
-      <point x="2438" y="751"/>
-    </contour>
-    <contour>
-      <point x="2799" y="812" type="curve"/>
-      <point x="2799" y="826"/>
-      <point x="2739" y="848"/>
-      <point x="2675" y="913" type="curve" smooth="yes"/>
-      <point x="2609" y="978"/>
-      <point x="2587" y="1029"/>
-      <point x="2573" y="1029" type="curve" smooth="yes"/>
-      <point x="2538" y="1029"/>
-      <point x="2368" y="848"/>
-      <point x="2368" y="812" type="curve" smooth="yes"/>
-      <point x="2368" y="769"/>
-      <point x="2542" y="594"/>
-      <point x="2584" y="594" type="curve" smooth="yes"/>
-      <point x="2618" y="594"/>
-      <point x="2801" y="776"/>
-    </contour>
-    <contour>
-      <point x="2425" y="1152" type="curve" smooth="yes"/>
-      <point x="2425" y="1166"/>
-      <point x="2375" y="1189"/>
-      <point x="2310" y="1253" type="curve" smooth="yes"/>
-      <point x="2245" y="1319"/>
-      <point x="2222" y="1369"/>
-      <point x="2208" y="1369" type="curve" smooth="yes"/>
-      <point x="2174" y="1369"/>
-      <point x="2003" y="1188"/>
-      <point x="2003" y="1152" type="curve" smooth="yes"/>
-      <point x="2003" y="1110"/>
-      <point x="2177" y="935"/>
-      <point x="2220" y="935" type="curve" smooth="yes"/>
-      <point x="2253" y="935"/>
-      <point x="2426" y="1117"/>
-    </contour>
-    <contour>
-      <point x="2778" y="1178" type="curve" smooth="yes"/>
-      <point x="2778" y="1191"/>
-      <point x="2728" y="1214"/>
-      <point x="2663" y="1278" type="curve" smooth="yes"/>
-      <point x="2598" y="1344"/>
-      <point x="2575" y="1394"/>
-      <point x="2561" y="1394" type="curve" smooth="yes"/>
-      <point x="2527" y="1394"/>
-      <point x="2356" y="1213"/>
-      <point x="2356" y="1178" type="curve" smooth="yes"/>
-      <point x="2356" y="1135"/>
-      <point x="2530" y="960"/>
-      <point x="2573" y="960" type="curve" smooth="yes"/>
-      <point x="2606" y="960"/>
-      <point x="2779" y="1142"/>
-    </contour>
-    <contour>
-      <point x="606" y="1312" type="curve" smooth="yes"/>
-      <point x="515" y="1312"/>
-      <point x="422" y="1219"/>
-      <point x="353" y="993" type="curve" smooth="yes"/>
-      <point x="223" y="565"/>
-      <point x="392" y="390"/>
-      <point x="815" y="578" type="curve" smooth="yes"/>
-      <point x="834" y="586"/>
-      <point x="839" y="570"/>
-      <point x="839" y="551" type="curve" smooth="yes"/>
-      <point x="839" y="380"/>
-      <point x="401" y="166"/>
-      <point x="113" y="48" type="curve" smooth="yes"/>
-      <point x="91" y="39"/>
-      <point x="115" y="-10"/>
-      <point x="137" y="-9" type="curve" smooth="yes"/>
-      <point x="232" y="-5"/>
-      <point x="749" y="52"/>
-      <point x="793" y="95" type="curve" smooth="yes"/>
-      <point x="847" y="147"/>
-      <point x="936" y="545"/>
-      <point x="936" y="774" type="curve" smooth="yes"/>
-      <point x="936" y="944"/>
-      <point x="831" y="1312"/>
-    </contour>
-    <contour>
-      <point x="1141" y="2107" type="curve" smooth="yes"/>
-      <point x="1147" y="2259"/>
-      <point x="1171" y="2304"/>
-      <point x="1179" y="2333" type="curve" smooth="yes"/>
-      <point x="1184" y="2351"/>
-      <point x="1166" y="2400"/>
-      <point x="1146" y="2378" type="curve" smooth="yes"/>
-      <point x="1106" y="2334"/>
-      <point x="988" y="2165"/>
-      <point x="978" y="1999" type="curve" smooth="yes"/>
-      <point x="960" y="1688"/>
-      <point x="972" y="1549"/>
-      <point x="970" y="1325" type="curve" smooth="yes"/>
-      <point x="969" y="1190"/>
-      <point x="902" y="1078"/>
-      <point x="738" y="949" type="curve"/>
-      <point x="682" y="920"/>
-      <point x="696" y="572"/>
-      <point x="738" y="609" type="curve"/>
-      <point x="944" y="815"/>
-      <point x="1028" y="994"/>
-      <point x="1066" y="1201" type="curve"/>
-      <point x="1082" y="1160"/>
-      <point x="1220" y="1226"/>
-      <point x="1196" y="1262" type="curve" smooth="yes"/>
-      <point x="1172" y="1298"/>
-      <point x="1132" y="1362"/>
-      <point x="1132" y="1463" type="curve" smooth="yes"/>
-      <point x="1132" y="1507"/>
-      <point x="1132" y="1553"/>
-      <point x="1132" y="1600" type="curve" smooth="yes"/>
-      <point x="1132" y="1756"/>
-      <point x="1132" y="1882"/>
-    </contour>
-    <contour>
-      <point x="1335" y="659" type="curve" smooth="yes"/>
-      <point x="1531" y="659"/>
-      <point x="1694" y="878"/>
-      <point x="1694" y="1219" type="curve" smooth="yes"/>
-      <point x="1694" y="1281"/>
-      <point x="1668" y="1306"/>
-      <point x="1630" y="1306" type="curve" smooth="yes"/>
-      <point x="1565" y="1306"/>
-      <point x="1432" y="1279"/>
-      <point x="1422" y="1361" type="curve"/>
-      <point x="1421" y="1375"/>
-      <point x="1349" y="1378"/>
-      <point x="1347" y="1360" type="curve" smooth="yes"/>
-      <point x="1344" y="1334"/>
-      <point x="1337" y="1259"/>
-      <point x="1377" y="1199" type="curve"/>
-      <point x="1250" y="1199"/>
-      <point x="1147" y="1220"/>
-      <point x="1135" y="1499" type="curve" smooth="yes"/>
-      <point x="1132" y="1581"/>
-      <point x="1004" y="1419"/>
-      <point x="1010" y="1339" type="curve" smooth="yes"/>
-      <point x="1034" y="1014"/>
-      <point x="1113" y="659"/>
-    </contour>
-    <contour>
-      <point x="2255" y="2212" type="curve" smooth="yes"/>
-      <point x="2255" y="2268"/>
-      <point x="2052" y="2281"/>
-      <point x="1931" y="2281" type="curve" smooth="yes"/>
-      <point x="1756" y="2281"/>
-      <point x="1606" y="2050"/>
-      <point x="1505" y="1827" type="curve" smooth="yes"/>
-      <point x="1495" y="1805"/>
-      <point x="1535" y="1778"/>
-      <point x="1547" y="1799" type="curve" smooth="yes"/>
-      <point x="1633" y="1950"/>
-      <point x="1716" y="1949"/>
-      <point x="1878" y="1949" type="curve" smooth="yes"/>
-      <point x="1969" y="1949"/>
-      <point x="2116" y="1939"/>
-      <point x="2116" y="1901" type="curve" smooth="yes"/>
-      <point x="2116" y="1845"/>
-      <point x="1781" y="1734"/>
-      <point x="1632" y="1657" type="curve" smooth="yes"/>
-      <point x="1531" y="1605"/>
-      <point x="1368" y="1524"/>
-      <point x="1345" y="1348" type="curve" smooth="yes"/>
-      <point x="1339" y="1305"/>
-      <point x="1423" y="1311"/>
-      <point x="1420" y="1349" type="curve" smooth="yes"/>
-      <point x="1410" y="1474"/>
-      <point x="1750" y="1566"/>
-      <point x="1946" y="1666" type="curve" smooth="yes"/>
-      <point x="2126" y="1758"/>
-      <point x="2255" y="1942"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
deleted file mode 100644
index 06eb5824d..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testKafSeenHehdo.draft" format="2">
-  <anchor x="929" y="727" name="_exit_hehdoach"/>
-  <anchor x="929" y="927" name="exit_hehdoachxxx"/>
-  <outline>
-    <contour>
-      <point x="2590" y="2070" type="curve" smooth="yes"/>
-      <point x="2590" y="2264"/>
-      <point x="2612" y="2287"/>
-      <point x="3006" y="2568" type="curve" smooth="yes"/>
-      <point x="3368" y="2826"/>
-      <point x="3489" y="3019"/>
-      <point x="3504" y="3263" type="curve" smooth="yes"/>
-      <point x="3505" y="3281"/>
-      <point x="3477" y="3303"/>
-      <point x="3468" y="3288" type="curve" smooth="yes"/>
-      <point x="3383" y="3150"/>
-      <point x="3347" y="3097"/>
-      <point x="3014" y="2858" type="curve" smooth="yes"/>
-      <point x="2692" y="2628"/>
-      <point x="2427" y="2173"/>
-      <point x="2427" y="1787" type="curve" smooth="yes"/>
-      <point x="2427" y="1519"/>
-      <point x="2414" y="1506"/>
-      <point x="2310" y="1439" type="curve" smooth="yes"/>
-      <point x="2285" y="1423"/>
-      <point x="2286" y="1072"/>
-      <point x="2310" y="1088" type="curve" smooth="yes"/>
-      <point x="2420" y="1161"/>
-      <point x="2459" y="1302"/>
-      <point x="2528" y="1525" type="curve" smooth="yes"/>
-      <point x="2585" y="1709"/>
-      <point x="2590" y="1787"/>
-    </contour>
-    <contour>
-      <point x="694" y="988" type="curve" smooth="yes"/>
-      <point x="283" y="985"/>
-      <point x="363" y="258"/>
-      <point x="199" y="148" type="curve" smooth="yes"/>
-      <point x="159" y="121"/>
-      <point x="356" y="202"/>
-      <point x="370" y="234" type="curve" smooth="yes"/>
-      <point x="433" y="379"/>
-      <point x="380" y="680"/>
-      <point x="599" y="680" type="curve" smooth="yes"/>
-      <point x="726" y="680"/>
-      <point x="767" y="590"/>
-      <point x="696" y="520" type="curve" smooth="yes"/>
-      <point x="669" y="493"/>
-      <point x="909" y="638"/>
-      <point x="921" y="661" type="curve" smooth="yes"/>
-      <point x="957" y="735"/>
-      <point x="869" y="989"/>
-    </contour>
-    <contour>
-      <point x="1129" y="857" type="curve" smooth="yes"/>
-      <point x="877" y="857"/>
-      <point x="635" y="264"/>
-      <point x="106" y="129" type="curve" smooth="yes"/>
-      <point x="86" y="123"/>
-      <point x="124" y="72"/>
-      <point x="137" y="75" type="curve" smooth="yes"/>
-      <point x="704" y="218"/>
-      <point x="774" y="594"/>
-      <point x="977" y="594" type="curve" smooth="yes"/>
-      <point x="1019" y="594"/>
-      <point x="1053" y="553"/>
-      <point x="1053" y="504" type="curve" smooth="yes"/>
-      <point x="1053" y="386"/>
-      <point x="910" y="266"/>
-      <point x="507" y="254" type="curve" smooth="yes"/>
-      <point x="471" y="253"/>
-      <point x="327" y="179"/>
-      <point x="360" y="179" type="curve" smooth="yes"/>
-      <point x="826" y="179"/>
-      <point x="1329" y="250"/>
-      <point x="1329" y="646" type="curve" smooth="yes"/>
-      <point x="1329" y="740"/>
-      <point x="1245" y="857"/>
-    </contour>
-    <contour>
-      <point x="1448" y="843" type="curve" smooth="yes"/>
-      <point x="1588" y="843"/>
-      <point x="1623" y="1049"/>
-      <point x="1657" y="1049" type="curve" smooth="yes"/>
-      <point x="1709" y="1049"/>
-      <point x="1756" y="938"/>
-      <point x="1819" y="938" type="curve" smooth="yes"/>
-      <point x="1982" y="938"/>
-      <point x="2019" y="1187"/>
-      <point x="2053" y="1187" type="curve" smooth="yes"/>
-      <point x="2104" y="1187"/>
-      <point x="2158" y="1066"/>
-      <point x="2226" y="1066" type="curve" smooth="yes"/>
-      <point x="2260" y="1066"/>
-      <point x="2287" y="1073"/>
-      <point x="2310" y="1088" type="curve" smooth="yes"/>
-      <point x="2410" y="1153"/>
-      <point x="2347" y="1465"/>
-      <point x="2310" y="1439" type="curve" smooth="yes"/>
-      <point x="2289" y="1424"/>
-      <point x="2266" y="1417"/>
-      <point x="2249" y="1417" type="curve" smooth="yes"/>
-      <point x="2172" y="1417"/>
-      <point x="2157" y="1569"/>
-      <point x="2108" y="1569" type="curve" smooth="yes"/>
-      <point x="2028" y="1569"/>
-      <point x="2017" y="1292"/>
-      <point x="1900" y="1289" type="curve" smooth="yes"/>
-      <point x="1819" y="1288"/>
-      <point x="1780" y="1432"/>
-      <point x="1741" y="1432" type="curve" smooth="yes"/>
-      <point x="1661" y="1432"/>
-      <point x="1666" y="1175"/>
-      <point x="1541" y="1175" type="curve" smooth="yes"/>
-      <point x="1504" y="1175"/>
-      <point x="1436" y="1244"/>
-      <point x="1360" y="1244" type="curve" smooth="yes"/>
-      <point x="1128" y="1244"/>
-      <point x="994" y="948"/>
-      <point x="900" y="741" type="curve" smooth="yes"/>
-      <point x="898" y="736"/>
-      <point x="949" y="689"/>
-      <point x="956" y="699" type="curve" smooth="yes"/>
-      <point x="1113" y="911"/>
-      <point x="1151" y="974"/>
-      <point x="1237" y="974" type="curve" smooth="yes"/>
-      <point x="1310" y="974"/>
-      <point x="1350" y="843"/>
-    </contour>
-    <contour>
-      <point x="1703" y="1852" type="curve" smooth="yes"/>
-      <point x="1703" y="1865"/>
-      <point x="1652" y="1888"/>
-      <point x="1588" y="1952" type="curve" smooth="yes"/>
-      <point x="1522" y="2018"/>
-      <point x="1500" y="2068"/>
-      <point x="1486" y="2068" type="curve" smooth="yes"/>
-      <point x="1451" y="2068"/>
-      <point x="1281" y="1887"/>
-      <point x="1281" y="1852" type="curve" smooth="yes"/>
-      <point x="1281" y="1809"/>
-      <point x="1455" y="1634"/>
-      <point x="1497" y="1634" type="curve" smooth="yes"/>
-      <point x="1531" y="1634"/>
-      <point x="1704" y="1816"/>
-    </contour>
-    <contour>
-      <point x="2056" y="1877" type="curve" smooth="yes"/>
-      <point x="2056" y="1891"/>
-      <point x="2005" y="1913"/>
-      <point x="1941" y="1978" type="curve" smooth="yes"/>
-      <point x="1875" y="2043"/>
-      <point x="1853" y="2094"/>
-      <point x="1839" y="2094" type="curve" smooth="yes"/>
-      <point x="1804" y="2094"/>
-      <point x="1634" y="1913"/>
-      <point x="1634" y="1877" type="curve" smooth="yes"/>
-      <point x="1634" y="1834"/>
-      <point x="1808" y="1659"/>
-      <point x="1850" y="1659" type="curve" smooth="yes"/>
-      <point x="1884" y="1659"/>
-      <point x="2057" y="1841"/>
-    </contour>
-    <contour>
-      <point x="1857" y="2240" type="curve" smooth="yes"/>
-      <point x="1857" y="2254"/>
-      <point x="1806" y="2277"/>
-      <point x="1742" y="2341" type="curve" smooth="yes"/>
-      <point x="1676" y="2407"/>
-      <point x="1654" y="2457"/>
-      <point x="1640" y="2457" type="curve" smooth="yes"/>
-      <point x="1606" y="2457"/>
-      <point x="1435" y="2276"/>
-      <point x="1435" y="2240" type="curve" smooth="yes"/>
-      <point x="1435" y="2198"/>
-      <point x="1609" y="2023"/>
-      <point x="1652" y="2023" type="curve" smooth="yes"/>
-      <point x="1685" y="2023"/>
-      <point x="1858" y="2205"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testM_eemK_afR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
deleted file mode 100644
index bc6ebe7e3..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testMeemKafReh" format="2">
-  <outline>
-    <contour>
-      <point x="764" y="700" type="curve" smooth="yes"/>
-      <point x="748" y="627"/>
-      <point x="642" y="475"/>
-      <point x="513" y="370" type="curve" smooth="yes"/>
-      <point x="443" y="312"/>
-      <point x="343" y="235"/>
-      <point x="83" y="84" type="curve" smooth="yes"/>
-      <point x="64" y="73"/>
-      <point x="81" y="-9"/>
-      <point x="102" y="-7" type="curve" smooth="yes"/>
-      <point x="156" y="0"/>
-      <point x="607" y="19"/>
-      <point x="702" y="119" type="curve" smooth="yes"/>
-      <point x="779" y="200"/>
-      <point x="845" y="563"/>
-      <point x="878" y="665" type="curve" smooth="yes"/>
-      <point x="889" y="699"/>
-      <point x="768" y="718"/>
-    </contour>
-    <contour>
-      <point x="1368" y="1970" type="curve" smooth="yes"/>
-      <point x="1379" y="2260"/>
-      <point x="1402" y="2276"/>
-      <point x="1845" y="2594" type="curve" smooth="yes"/>
-      <point x="2251" y="2886"/>
-      <point x="2372" y="3077"/>
-      <point x="2387" y="3321" type="curve" smooth="yes"/>
-      <point x="2388" y="3339"/>
-      <point x="2360" y="3361"/>
-      <point x="2351" y="3346" type="curve" smooth="yes"/>
-      <point x="2266" y="3208"/>
-      <point x="2230" y="3162"/>
-      <point x="1852" y="2890" type="curve" smooth="yes"/>
-      <point x="1433" y="2589"/>
-      <point x="1191" y="2279"/>
-      <point x="1191" y="1781" type="curve" smooth="yes"/>
-      <point x="1191" y="1335"/>
-      <point x="1209" y="1203"/>
-      <point x="1163" y="1135" type="curve" smooth="yes"/>
-      <point x="1083" y="1016"/>
-      <point x="889" y="1096"/>
-      <point x="769" y="665" type="curve" smooth="yes"/>
-      <point x="759" y="629"/>
-      <point x="866" y="573"/>
-      <point x="883" y="630" type="curve" smooth="yes"/>
-      <point x="951" y="850"/>
-      <point x="1103" y="773"/>
-      <point x="1218" y="1020" type="curve" smooth="yes"/>
-      <point x="1280" y="1153"/>
-      <point x="1362" y="1477"/>
-      <point x="1362" y="1739" type="curve" smooth="yes"/>
-      <point x="1362" y="1826"/>
-      <point x="1366" y="1910"/>
-    </contour>
-    <contour>
-      <point x="1357" y="1698" type="curve" smooth="yes"/>
-      <point x="1355" y="1780"/>
-      <point x="1225" y="1618"/>
-      <point x="1232" y="1538" type="curve" smooth="yes"/>
-      <point x="1257" y="1244"/>
-      <point x="1283" y="785"/>
-      <point x="1623" y="785" type="curve" smooth="yes"/>
-      <point x="2056" y="785"/>
-      <point x="2194" y="1602"/>
-      <point x="1781" y="1728" type="curve" smooth="yes"/>
-      <point x="1678" y="1760"/>
-      <point x="1546" y="1413"/>
-      <point x="1543" y="1341" type="curve"/>
-      <point x="1444" y="1235"/>
-      <point x="1361" y="1498"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
deleted file mode 100644
index 9b75b4c9d..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testSadBehLamNoon.draft" format="2">
-  <outline>
-    <contour>
-      <point x="3057" y="1812" type="curve" smooth="yes"/>
-      <point x="3098" y="1812"/>
-      <point x="3301" y="1597"/>
-      <point x="3484" y="1597" type="curve" smooth="yes"/>
-      <point x="3828" y="1597"/>
-      <point x="4062" y="2129"/>
-      <point x="4062" y="2447" type="curve" smooth="yes"/>
-      <point x="4062" y="2542"/>
-      <point x="4021" y="2705"/>
-      <point x="3903" y="2705" type="curve" smooth="yes"/>
-      <point x="3629" y="2705"/>
-      <point x="3379" y="2294"/>
-      <point x="3273" y="2080" type="curve"/>
-      <point x="3273" y="2080"/>
-      <point x="3319" y="2064"/>
-      <point x="3331" y="2064" type="curve"/>
-      <point x="3457" y="2248"/>
-      <point x="3644" y="2374"/>
-      <point x="3808" y="2374" type="curve" smooth="yes"/>
-      <point x="3952" y="2374"/>
-      <point x="3999" y="2337"/>
-      <point x="3985" y="2296" type="curve" smooth="yes"/>
-      <point x="3976" y="2270"/>
-      <point x="3893" y="2148"/>
-      <point x="3475" y="2157" type="curve" smooth="yes"/>
-      <point x="3341" y="2160"/>
-      <point x="3256" y="2233"/>
-      <point x="3202" y="2233" type="curve" smooth="yes"/>
-      <point x="3104" y="2233"/>
-      <point x="3022" y="1957"/>
-      <point x="2935" y="1957" type="curve" smooth="yes"/>
-      <point x="2884" y="1957"/>
-      <point x="2815" y="2005"/>
-      <point x="2762" y="2005" type="curve" smooth="yes"/>
-      <point x="2712" y="2005"/>
-      <point x="2667" y="1970"/>
-      <point x="2575" y="1868" type="curve" smooth="yes"/>
-      <point x="2540" y="1829"/>
-      <point x="2551" y="1515"/>
-      <point x="2575" y="1552" type="curve" smooth="yes"/>
-      <point x="2615" y="1614"/>
-      <point x="2645" y="1677"/>
-      <point x="2687" y="1677" type="curve" smooth="yes"/>
-      <point x="2772" y="1677"/>
-      <point x="2759" y="1605"/>
-      <point x="2846" y="1605" type="curve" smooth="yes"/>
-      <point x="2934" y="1605"/>
-      <point x="3014" y="1812"/>
-    </contour>
-    <contour>
-      <point x="2575" y="1868" type="curve" smooth="yes"/>
-      <point x="2509" y="1795"/>
-      <point x="2421" y="1729"/>
-      <point x="2271" y="1731" type="curve" smooth="yes"/>
-      <point x="2079" y="1733"/>
-      <point x="2064" y="1808"/>
-      <point x="2058" y="1941" type="curve" smooth="yes"/>
-      <point x="2055" y="2011"/>
-      <point x="1909" y="1871"/>
-      <point x="1913" y="1781" type="curve" smooth="yes"/>
-      <point x="1930" y="1407"/>
-      <point x="1978" y="1171"/>
-      <point x="2181" y="1171" type="curve" smooth="yes"/>
-      <point x="2323" y="1171"/>
-      <point x="2495" y="1433"/>
-      <point x="2575" y="1553" type="curve" smooth="yes"/>
-      <point x="2591" y="1577"/>
-      <point x="2596" y="1891"/>
-    </contour>
-    <contour>
-      <point x="2057" y="2449" type="curve" smooth="yes"/>
-      <point x="2063" y="2601"/>
-      <point x="2107" y="2646"/>
-      <point x="2115" y="2675" type="curve" smooth="yes"/>
-      <point x="2120" y="2693"/>
-      <point x="2102" y="2742"/>
-      <point x="2082" y="2720" type="curve" smooth="yes"/>
-      <point x="2042" y="2676"/>
-      <point x="1902" y="2507"/>
-      <point x="1894" y="2262" type="curve" smooth="yes"/>
-      <point x="1885" y="2001"/>
-      <point x="1891" y="1871"/>
-      <point x="1891" y="1647" type="curve" smooth="yes"/>
-      <point x="1891" y="1252"/>
-      <point x="1602" y="1211"/>
-      <point x="1496" y="1273" type="curve" smooth="yes"/>
-      <point x="1490" y="1277"/>
-      <point x="1481" y="934"/>
-      <point x="1495" y="934" type="curve" smooth="yes"/>
-      <point x="1722" y="934"/>
-      <point x="1906" y="1240"/>
-      <point x="1957" y="1560" type="curve"/>
-      <point x="1973" y="1518"/>
-      <point x="2148" y="1574"/>
-      <point x="2117" y="1609" type="curve" smooth="yes"/>
-      <point x="2086" y="1645"/>
-      <point x="2058" y="1704"/>
-      <point x="2058" y="1805" type="curve" smooth="yes"/>
-      <point x="2058" y="1849"/>
-      <point x="2058" y="1895"/>
-      <point x="2058" y="1942" type="curve" smooth="yes"/>
-      <point x="2058" y="2098"/>
-      <point x="2048" y="2224"/>
-    </contour>
-    <contour>
-      <point x="1569" y="1054" type="curve"/>
-      <point x="1577" y="1058"/>
-      <point x="1613" y="1230"/>
-      <point x="1576" y="1230" type="curve" smooth="yes"/>
-      <point x="1517" y="1230"/>
-      <point x="1508" y="1273"/>
-      <point x="1496" y="1273" type="curve" smooth="yes"/>
-      <point x="1466" y="1273"/>
-      <point x="1456" y="1150"/>
-      <point x="1456" y="1113" type="curve" smooth="yes"/>
-      <point x="1456" y="1074"/>
-      <point x="1478" y="966"/>
-      <point x="1480" y="885" type="curve" smooth="yes"/>
-      <point x="1482" y="809"/>
-      <point x="1487" y="721"/>
-      <point x="1479" y="665" type="curve" smooth="yes"/>
-      <point x="1455" y="478"/>
-      <point x="1196" y="-60"/>
-      <point x="699" y="-60" type="curve" smooth="yes"/>
-      <point x="247" y="-60"/>
-      <point x="180" y="447"/>
-      <point x="347" y="856" type="curve" smooth="yes"/>
-      <point x="356" y="878"/>
-      <point x="310" y="898"/>
-      <point x="300" y="878" type="curve" smooth="yes"/>
-      <point x="-79" y="163"/>
-      <point x="108" y="-620"/>
-      <point x="631" y="-620" type="curve" smooth="yes"/>
-      <point x="1160" y="-620"/>
-      <point x="1569" y="124"/>
-    </contour>
-    <contour>
-      <point x="3752" y="3028" type="curve" smooth="yes"/>
-      <point x="3752" y="3042"/>
-      <point x="3702" y="3064"/>
-      <point x="3637" y="3129" type="curve" smooth="yes"/>
-      <point x="3572" y="3194"/>
-      <point x="3549" y="3255"/>
-      <point x="3535" y="3255" type="curve" smooth="yes"/>
-      <point x="3501" y="3255"/>
-      <point x="3320" y="3064"/>
-      <point x="3320" y="3028" type="curve" smooth="yes"/>
-      <point x="3320" y="2985"/>
-      <point x="3504" y="2810"/>
-      <point x="3547" y="2810" type="curve" smooth="yes"/>
-      <point x="3580" y="2810"/>
-      <point x="3753" y="2992"/>
-    </contour>
-    <contour>
-      <point x="2464" y="753" type="curve" smooth="yes"/>
-      <point x="2464" y="767"/>
-      <point x="2414" y="790"/>
-      <point x="2349" y="854" type="curve" smooth="yes"/>
-      <point x="2284" y="920"/>
-      <point x="2261" y="980"/>
-      <point x="2247" y="980" type="curve" smooth="yes"/>
-      <point x="2213" y="980"/>
-      <point x="2042" y="789"/>
-      <point x="2042" y="753" type="curve" smooth="yes"/>
-      <point x="2042" y="711"/>
-      <point x="2216" y="536"/>
-      <point x="2259" y="536" type="curve" smooth="yes"/>
-      <point x="2292" y="536"/>
-      <point x="2465" y="718"/>
-    </contour>
-    <contour>
-      <point x="2771" y="788" type="curve" smooth="yes"/>
-      <point x="2771" y="802"/>
-      <point x="2721" y="824"/>
-      <point x="2657" y="889" type="curve" smooth="yes"/>
-      <point x="2591" y="954"/>
-      <point x="2568" y="1005"/>
-      <point x="2555" y="1005" type="curve" smooth="yes"/>
-      <point x="2520" y="1005"/>
-      <point x="2349" y="824"/>
-      <point x="2349" y="788" type="curve" smooth="yes"/>
-      <point x="2349" y="745"/>
-      <point x="2524" y="570"/>
-      <point x="2566" y="570" type="curve" smooth="yes"/>
-      <point x="2599" y="570"/>
-      <point x="2772" y="752"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/contents.plist b/source/masters/AwamiNastaliq-Black.ufo/glyphs/contents.plist
index 98403b24c..78adafa12 100644
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/contents.plist
+++ b/source/masters/AwamiNastaliq-Black.ufo/glyphs/contents.plist
@@ -2896,16 +2896,12 @@
   <string>ligA_layhiA_sS_alaam.glif</string>
   <key>ligAlayhiAsSalaam.alt</key>
   <string>ligA_layhiA_sS_alaam.alt.glif</string>
-  <key>ligAlayhiAsSalam.scratch</key>
-  <string>ligA_layhiA_sS_alam.scratch.glif</string>
   <key>ligAlayhimAsSalaam</key>
   <string>ligA_layhimA_sS_alaam.glif</string>
   <key>ligAlayhimaaAsSalaam</key>
   <string>ligA_layhimaaA_sS_alaam.glif</string>
   <key>ligAllahlong</key>
   <string>ligA_llahlong.glif</string>
-  <key>ligAllahlong.alt</key>
-  <string>ligA_llahlong.alt.glif</string>
   <key>ligBismillah</key>
   <string>ligB_ismillah.glif</string>
   <key>ligJallajalalouhou</key>
@@ -3220,38 +3216,6 @@
   <string>t.glif</string>
   <key>tab</key>
   <string>tab.glif</string>
-  <key>testAinGafJeemMeem</key>
-  <string>testA_inG_afJ_eemM_eem.glif</string>
-  <key>testAinGafJeemMeem.draft</key>
-  <string>testA_inG_afJ_eemM_eem.draft.glif</string>
-  <key>testAinKafBehReh</key>
-  <string>testA_inK_afB_ehR_eh.glif</string>
-  <key>testAlefTahHehgoalFeh</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.glif</string>
-  <key>testAlefTahHehgoalFeh.draft</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.draft.glif</string>
-  <key>testDalSeenBariyeh</key>
-  <string>testD_alS_eenB_ariyeh.glif</string>
-  <key>testFehBehAinReh</key>
-  <string>testF_ehB_ehA_inR_eh.glif</string>
-  <key>testFehBehAinReh.draft</key>
-  <string>testF_ehB_ehA_inR_eh.draft.glif</string>
-  <key>testGafSeenHehdo</key>
-  <string>testG_afS_eenH_ehdo.glif</string>
-  <key>testHehdoDalHehdoAinJeem</key>
-  <string>testH_ehdoD_alH_ehdoA_inJ_eem.glif</string>
-  <key>testHehgoalSadQaf</key>
-  <string>testH_ehgoalS_adQ_af.glif</string>
-  <key>testJeemMeemaltLamWaw</key>
-  <string>testJ_eemM_eemaltL_amW_aw.glif</string>
-  <key>testJeemMeemaltLamWaw.draft</key>
-  <string>testJ_eemM_eemaltL_amW_aw.draft.glif</string>
-  <key>testKafSeenHehdo.draft</key>
-  <string>testK_afS_eenH_ehdo.draft.glif</string>
-  <key>testMeemKafReh</key>
-  <string>testM_eemK_afR_eh.glif</string>
-  <key>testSadBehLamNoon.draft</key>
-  <string>testS_adB_ehL_amN_oon.draft.glif</string>
   <key>thinSpace</key>
   <string>thinS_pace.glif</string>
   <key>thorn</key>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
deleted file mode 100644
index 5cfe7ab08..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAlayhiAsSalam.scratch" format="2">
-  <advance width="6136"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_llahlong.alt.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_llahlong.alt.glif
deleted file mode 100644
index 4bd1fc814..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/ligA_llahlong.alt.glif
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAllahlong.alt" format="2">
-  <advance width="5737"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
deleted file mode 100644
index 99b2b6d81..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem.draft" format="2">
-  <advance width="2952"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
deleted file mode 100644
index c3687dd33..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem" format="2">
-  <advance width="3153"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inK_afB_ehR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inK_afB_ehR_eh.glif
deleted file mode 100644
index 9b6f42227..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_inK_afB_ehR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinKafBehReh" format="2">
-  <advance width="3085"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
deleted file mode 100644
index 43959b0e3..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh.draft" format="2">
-  <advance width="4665"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
deleted file mode 100644
index d29171082..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh" format="2">
-  <advance width="4666"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testD_alS_eenB_ariyeh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testD_alS_eenB_ariyeh.glif
deleted file mode 100644
index 943a33348..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testD_alS_eenB_ariyeh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testDalSeenBariyeh" format="2">
-  <advance width="3444"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
deleted file mode 100644
index d110c49cc..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh.draft" format="2">
-  <advance width="2775"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
deleted file mode 100644
index 3312758e7..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh" format="2">
-  <advance width="2775"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testG_afS_eenH_ehdo.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testG_afS_eenH_ehdo.glif
deleted file mode 100644
index a49e81583..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testG_afS_eenH_ehdo.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testGafSeenHehdo" format="2">
-  <advance width="3604"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
deleted file mode 100644
index 130f557b4..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehdoDalHehdoAinJeem" format="2">
-  <advance width="3259"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehgoalS_adQ_af.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehgoalS_adQ_af.glif
deleted file mode 100644
index 7a4ed4061..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testH_ehgoalS_adQ_af.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehgoalSadQaf" format="2">
-  <advance width="3623"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
deleted file mode 100644
index a31c2995b..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw.draft" format="2">
-  <advance width="2869"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
deleted file mode 100644
index 4b769a040..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw" format="2">
-  <advance width="2869"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
deleted file mode 100644
index 2de537e0a..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testKafSeenHehdo.draft" format="2">
-  <advance width="3604"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testM_eemK_afR_eh.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testM_eemK_afR_eh.glif
deleted file mode 100644
index 1b237cffa..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testM_eemK_afR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testMeemKafReh" format="2">
-  <advance width="2422"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif b/source/masters/AwamiNastaliq-Black.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif
deleted file mode 100644
index 641667912..000000000
--- a/source/masters/AwamiNastaliq-Black.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testSadBehLamNoon.draft" format="2">
-  <advance width="4162"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Black.ufo/lib.plist b/source/masters/AwamiNastaliq-Black.ufo/lib.plist
index be398e29c..1279fa6f5 100644
--- a/source/masters/AwamiNastaliq-Black.ufo/lib.plist
+++ b/source/masters/AwamiNastaliq-Black.ufo/lib.plist
@@ -39,10 +39,6 @@
   <string>3260</string>
   <key>com.schriftgestaltung.customName</key>
   <string>Black</string>
-  <key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
-  <array>
-    <string>/ligRadiAllaahuAhn/ligRadiAllaahuAnhaa/ligRadiAllaahuAnhumaa/ligRadiAllaahuAnhunna</string>
-  </array>
   <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
   <true/>
   <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/fontinfo.plist b/source/masters/AwamiNastaliq-Regular.ufo/fontinfo.plist
index 8cb388fe9..dbdded03b 100644
--- a/source/masters/AwamiNastaliq-Regular.ufo/fontinfo.plist
+++ b/source/masters/AwamiNastaliq-Regular.ufo/fontinfo.plist
@@ -13,7 +13,7 @@
   <key>familyName</key>
   <string>Awami Nastaliq</string>
   <key>openTypeHeadCreated</key>
-  <string>2024/09/25 13:20:01</string>
+  <string>2024/10/01 16:30:50</string>
   <key>openTypeHheaAscender</key>
   <integer>3600</integer>
   <key>openTypeHheaDescender</key>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/contents.plist b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/contents.plist
index 3602d9f9a..9708bb42b 100644
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/contents.plist
+++ b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/contents.plist
@@ -1676,8 +1676,6 @@
   <string>ligA_layhimaaA_sS_alaam.glif</string>
   <key>ligAllahlong</key>
   <string>ligA_llahlong.glif</string>
-  <key>ligAllahlong.alt</key>
-  <string>ligA_llahlong.alt.glif</string>
   <key>ligBismillah</key>
   <string>ligB_ismillah.glif</string>
   <key>ligJallajalalouhou</key>
@@ -1814,36 +1812,6 @@
   <string>space.visX_wide.glif</string>
   <key>t</key>
   <string>t.glif</string>
-  <key>testAinGafJeemMeem</key>
-  <string>testA_inG_afJ_eemM_eem.glif</string>
-  <key>testAinGafJeemMeem.draft</key>
-  <string>testA_inG_afJ_eemM_eem.draft.glif</string>
-  <key>testAinKafBehReh</key>
-  <string>testA_inK_afB_ehR_eh.glif</string>
-  <key>testAlefTahHehgoalFeh</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.glif</string>
-  <key>testAlefTahHehgoalFeh.draft</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.draft.glif</string>
-  <key>testDalSeenBariyeh</key>
-  <string>testD_alS_eenB_ariyeh.glif</string>
-  <key>testFehBehAinReh</key>
-  <string>testF_ehB_ehA_inR_eh.glif</string>
-  <key>testFehBehAinReh.draft</key>
-  <string>testF_ehB_ehA_inR_eh.draft.glif</string>
-  <key>testHehdoDalHehdoAinJeem</key>
-  <string>testH_ehdoD_alH_ehdoA_inJ_eem.glif</string>
-  <key>testHehgoalSadQaf</key>
-  <string>testH_ehgoalS_adQ_af.glif</string>
-  <key>testJeemMeemaltLamWaw</key>
-  <string>testJ_eemM_eemaltL_amW_aw.glif</string>
-  <key>testJeemMeemaltLamWaw.draft</key>
-  <string>testJ_eemM_eemaltL_amW_aw.draft.glif</string>
-  <key>testKafSeenHehdo.draft</key>
-  <string>testK_afS_eenH_ehdo.draft.glif</string>
-  <key>testMeemKafReh</key>
-  <string>testM_eemK_afR_eh.glif</string>
-  <key>testSadBehLamNoon.draft</key>
-  <string>testS_adB_ehL_amN_oon.draft.glif</string>
   <key>three.small</key>
   <string>three.small.glif</string>
   <key>tilde</key>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/ligA_llahlong.alt.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/ligA_llahlong.alt.glif
deleted file mode 100644
index 3d950e907..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/ligA_llahlong.alt.glif
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAllahlong.alt" format="2">
-  <outline>
-    <contour>
-      <point x="3919" y="516" type="curve"/>
-      <point x="3970" y="330"/>
-      <point x="4148" y="141"/>
-      <point x="4375" y="141" type="curve" smooth="yes"/>
-      <point x="4571" y="141"/>
-      <point x="4830" y="496"/>
-      <point x="4858" y="496" type="curve" smooth="yes"/>
-      <point x="4880" y="496"/>
-      <point x="4993" y="333"/>
-      <point x="5178" y="333" type="curve" smooth="yes"/>
-      <point x="5466" y="333"/>
-      <point x="5737" y="632"/>
-      <point x="5737" y="1001" type="curve" smooth="yes"/>
-      <point x="5737" y="1057"/>
-      <point x="5699" y="1150"/>
-      <point x="5597" y="1150" type="curve" smooth="yes"/>
-      <point x="5354" y="1150"/>
-      <point x="5151" y="836"/>
-      <point x="5014" y="645" type="curve"/>
-      <point x="5014" y="645"/>
-      <point x="5062" y="633"/>
-      <point x="5081" y="625" type="curve"/>
-      <point x="5224" y="832"/>
-      <point x="5375" y="969"/>
-      <point x="5509" y="969" type="curve" smooth="yes"/>
-      <point x="5627" y="969"/>
-      <point x="5668" y="881"/>
-      <point x="5658" y="851" type="curve" smooth="yes"/>
-      <point x="5649" y="824"/>
-      <point x="5499" y="633"/>
-      <point x="5171" y="633" type="curve" smooth="yes"/>
-      <point x="5022" y="633"/>
-      <point x="4946" y="708"/>
-      <point x="4893" y="708" type="curve" smooth="yes"/>
-      <point x="4813" y="708"/>
-      <point x="4623" y="428"/>
-      <point x="4468" y="428" type="curve" smooth="yes"/>
-      <point x="4171" y="428"/>
-      <point x="3986" y="787"/>
-      <point x="3974" y="1065" type="curve"/>
-      <point x="3974" y="1221"/>
-      <point x="3974" y="1647"/>
-      <point x="3983" y="1872" type="curve" smooth="yes"/>
-      <point x="3989" y="2024"/>
-      <point x="4013" y="2069"/>
-      <point x="4021" y="2098" type="curve" smooth="yes"/>
-      <point x="4026" y="2116"/>
-      <point x="4008" y="2165"/>
-      <point x="3988" y="2143" type="curve" smooth="yes"/>
-      <point x="3948" y="2099"/>
-      <point x="3850" y="1940"/>
-      <point x="3840" y="1774" type="curve" smooth="yes"/>
-      <point x="3822" y="1463"/>
-      <point x="3834" y="934"/>
-      <point x="3832" y="710" type="curve" smooth="yes"/>
-      <point x="3830" y="500"/>
-      <point x="3580" y="432"/>
-      <point x="3378" y="188" type="curve" smooth="yes"/>
-      <point x="3295" y="87"/>
-      <point x="3213" y="-30"/>
-      <point x="3213" y="-156" type="curve" smooth="yes"/>
-      <point x="3213" y="-380"/>
-      <point x="3701" y="-570"/>
-      <point x="3701" y="-662" type="curve" smooth="yes"/>
-      <point x="3701" y="-748"/>
-      <point x="3309" y="-1185"/>
-      <point x="2016" y="-1185" type="curve" smooth="yes"/>
-      <point x="-153" y="-1185"/>
-      <point x="452" y="-448"/>
-      <point x="776" y="79" type="curve" smooth="yes"/>
-      <point x="793" y="107"/>
-      <point x="755" y="139"/>
-      <point x="748" y="131" type="curve" smooth="yes"/>
-      <point x="420" y="-259"/>
-      <point x="346" y="-591"/>
-      <point x="346" y="-862" type="curve" smooth="yes"/>
-      <point x="346" y="-1162"/>
-      <point x="440" y="-1525"/>
-      <point x="1948" y="-1525" type="curve" smooth="yes"/>
-      <point x="3027" y="-1525"/>
-      <point x="3599" y="-1195"/>
-      <point x="3761" y="-807" type="curve" smooth="yes"/>
-      <point x="3900" y="-474"/>
-      <point x="3833" y="-349"/>
-      <point x="3770" y="-285" type="curve" smooth="yes"/>
-      <point x="3704" y="-218"/>
-      <point x="3435" y="-45"/>
-      <point x="3435" y="41" type="curve" smooth="yes"/>
-      <point x="3435" y="68"/>
-      <point x="3447" y="102"/>
-      <point x="3472" y="135" type="curve" smooth="yes"/>
-      <point x="3575" y="275"/>
-      <point x="3704" y="282"/>
-    </contour>
-    <contour>
-      <point x="5067" y="2209" type="curve" smooth="yes"/>
-      <point x="4923" y="2209"/>
-      <point x="4811" y="2022"/>
-      <point x="4715" y="1906" type="curve" smooth="yes"/>
-      <point x="4612" y="1782"/>
-      <point x="4589" y="1722"/>
-      <point x="4589" y="1673" type="curve" smooth="yes"/>
-      <point x="4589" y="1592"/>
-      <point x="4643" y="1514"/>
-      <point x="4781" y="1484" type="curve"/>
-      <point x="4781" y="1484"/>
-      <point x="5077" y="1751"/>
-      <point x="5077" y="1751" type="curve"/>
-      <point x="4894" y="1665"/>
-      <point x="4804" y="1845"/>
-      <point x="4809" y="1921" type="curve" smooth="yes"/>
-      <point x="4812" y="1963"/>
-      <point x="4869" y="2072"/>
-      <point x="4969" y="2072" type="curve" smooth="yes"/>
-      <point x="5062" y="2072"/>
-      <point x="5084" y="2025"/>
-      <point x="5146" y="2025" type="curve" smooth="yes"/>
-      <point x="5268" y="2025"/>
-      <point x="5261" y="2209"/>
-    </contour>
-    <contour>
-      <point x="2552" y="1296" type="curve" smooth="yes"/>
-      <point x="2420" y="1296"/>
-      <point x="2242" y="1237"/>
-      <point x="2053" y="819" type="curve" smooth="yes"/>
-      <point x="2047" y="807"/>
-      <point x="2071" y="797"/>
-      <point x="2078" y="805" type="curve" smooth="yes"/>
-      <point x="2227" y="978"/>
-      <point x="2356" y="1052"/>
-      <point x="2438" y="1052" type="curve" smooth="yes"/>
-      <point x="2701" y="1052"/>
-      <point x="2793" y="997"/>
-      <point x="3120" y="997" type="curve" smooth="yes"/>
-      <point x="3383" y="997"/>
-      <point x="3500" y="1281"/>
-      <point x="3599" y="1470" type="curve"/>
-      <point x="3669" y="1418"/>
-      <point x="3811" y="1333"/>
-      <point x="3887" y="1333" type="curve" smooth="yes"/>
-      <point x="3962" y="1333"/>
-      <point x="4212" y="1521"/>
-      <point x="4295" y="1648" type="curve"/>
-      <point x="4335" y="1456"/>
-      <point x="4446" y="1340"/>
-      <point x="4569" y="1340" type="curve" smooth="yes"/>
-      <point x="5089" y="1340"/>
-      <point x="5236" y="1617"/>
-      <point x="5322" y="1884" type="curve" smooth="yes"/>
-      <point x="5332" y="1915"/>
-      <point x="5276" y="1934"/>
-      <point x="5266" y="1909" type="curve" smooth="yes"/>
-      <point x="5205" y="1756"/>
-      <point x="4869" y="1680"/>
-      <point x="4684" y="1680" type="curve" smooth="yes"/>
-      <point x="4459" y="1680"/>
-      <point x="4355" y="1827"/>
-      <point x="4345" y="2095" type="curve"/>
-      <point x="4345" y="2251"/>
-      <point x="4345" y="2477"/>
-      <point x="4354" y="2702" type="curve" smooth="yes"/>
-      <point x="4360" y="2854"/>
-      <point x="4384" y="2899"/>
-      <point x="4392" y="2928" type="curve" smooth="yes"/>
-      <point x="4397" y="2946"/>
-      <point x="4379" y="2995"/>
-      <point x="4359" y="2973" type="curve" smooth="yes"/>
-      <point x="4319" y="2929"/>
-      <point x="4221" y="2770"/>
-      <point x="4211" y="2604" type="curve" smooth="yes"/>
-      <point x="4193" y="2293"/>
-      <point x="4205" y="2024"/>
-      <point x="4203" y="1800" type="curve" smooth="yes"/>
-      <point x="4201" y="1528"/>
-      <point x="3903" y="1442"/>
-      <point x="3635" y="1543" type="curve"/>
-      <point x="3650" y="1576"/>
-      <point x="3655" y="1593"/>
-      <point x="3666" y="1626" type="curve" smooth="yes"/>
-      <point x="3670" y="1639"/>
-      <point x="3653" y="1657"/>
-      <point x="3646" y="1647" type="curve" smooth="yes"/>
-      <point x="3630" y="1623"/>
-      <point x="3467" y="1256"/>
-      <point x="3227" y="1256" type="curve" smooth="yes"/>
-      <point x="3058" y="1256"/>
-      <point x="2851" y="1296"/>
-    </contour>
-    <contour>
-      <point x="2379" y="231" type="curve" smooth="yes"/>
-      <point x="2379" y="387"/>
-      <point x="2381" y="1733"/>
-      <point x="2388" y="1958" type="curve" smooth="yes"/>
-      <point x="2393" y="2110"/>
-      <point x="2418" y="2155"/>
-      <point x="2426" y="2184" type="curve" smooth="yes"/>
-      <point x="2431" y="2202"/>
-      <point x="2413" y="2251"/>
-      <point x="2393" y="2229" type="curve" smooth="yes"/>
-      <point x="2353" y="2185"/>
-      <point x="2255" y="2026"/>
-      <point x="2245" y="1860" type="curve" smooth="yes"/>
-      <point x="2227" y="1549"/>
-      <point x="2239" y="160"/>
-      <point x="2237" y="-64" type="curve" smooth="yes"/>
-      <point x="2235" y="-256"/>
-      <point x="2152" y="-341"/>
-      <point x="2042" y="-341" type="curve" smooth="yes"/>
-      <point x="1923" y="-341"/>
-      <point x="1880" y="-237"/>
-      <point x="1869" y="62" type="curve" smooth="yes"/>
-      <point x="1866" y="145"/>
-      <point x="1761" y="-67"/>
-      <point x="1770" y="-146" type="curve"/>
-      <point x="1810" y="-471"/>
-      <point x="1832" y="-686"/>
-      <point x="1995" y="-686" type="curve" smooth="yes"/>
-      <point x="2156" y="-686"/>
-      <point x="2379" y="-297"/>
-    </contour>
-    <contour>
-      <point x="1370" y="114" type="curve" smooth="yes"/>
-      <point x="1376" y="128"/>
-      <point x="1328" y="136"/>
-      <point x="1322" y="118" type="curve" smooth="yes"/>
-      <point x="1186" y="-349"/>
-      <point x="1005" y="-601"/>
-      <point x="770" y="-772" type="curve" smooth="yes"/>
-      <point x="752" y="-785"/>
-      <point x="775" y="-823"/>
-      <point x="797" y="-817" type="curve" smooth="yes"/>
-      <point x="1080" y="-749"/>
-      <point x="1191" y="-645"/>
-      <point x="1285" y="-392" type="curve"/>
-      <point x="1379" y="-518"/>
-      <point x="1342" y="-164"/>
-      <point x="1341" y="-26" type="curve" smooth="yes"/>
-      <point x="1341" y="12"/>
-      <point x="1361" y="91"/>
-    </contour>
-    <contour>
-      <point x="1871" y="102" type="curve" smooth="yes"/>
-      <point x="1871" y="181"/>
-      <point x="1874" y="1640"/>
-      <point x="1878" y="1754" type="curve" smooth="yes"/>
-      <point x="1883" y="1906"/>
-      <point x="1908" y="1951"/>
-      <point x="1916" y="1980" type="curve" smooth="yes"/>
-      <point x="1921" y="1998"/>
-      <point x="1903" y="2047"/>
-      <point x="1883" y="2025" type="curve" smooth="yes"/>
-      <point x="1843" y="1981"/>
-      <point x="1745" y="1822"/>
-      <point x="1735" y="1656" type="curve" smooth="yes"/>
-      <point x="1724" y="1458"/>
-      <point x="1722" y="-53"/>
-      <point x="1726" y="-187" type="curve" smooth="yes"/>
-      <point x="1732" y="-379"/>
-      <point x="1631" y="-425"/>
-      <point x="1534" y="-425" type="curve" smooth="yes"/>
-      <point x="1412" y="-425"/>
-      <point x="1321" y="-272"/>
-      <point x="1370" y="114" type="curve" smooth="yes"/>
-      <point x="1373" y="137"/>
-      <point x="1252" y="-152"/>
-      <point x="1256" y="-231" type="curve" smooth="yes"/>
-      <point x="1275" y="-555"/>
-      <point x="1323" y="-770"/>
-      <point x="1486" y="-770" type="curve" smooth="yes"/>
-      <point x="1617" y="-770"/>
-      <point x="1793" y="-563"/>
-      <point x="1832" y="-353" type="curve"/>
-      <point x="1848" y="-394"/>
-      <point x="1916" y="-344"/>
-      <point x="1904" y="-298" type="curve" smooth="yes"/>
-      <point x="1882" y="-211"/>
-      <point x="1871" y="-48"/>
-    </contour>
-    <contour>
-      <point x="2677" y="1168" type="curve" smooth="yes"/>
-      <point x="2651" y="701"/>
-      <point x="2764" y="79"/>
-      <point x="2745" y="-328" type="curve" smooth="yes"/>
-      <point x="2731" y="-612"/>
-      <point x="2683" y="-705"/>
-      <point x="2673" y="-760" type="curve" smooth="yes"/>
-      <point x="2668" y="-787"/>
-      <point x="2706" y="-847"/>
-      <point x="2723" y="-817" type="curve" smooth="yes"/>
-      <point x="2778" y="-721"/>
-      <point x="2899" y="-277"/>
-      <point x="2884" y="539" type="curve" smooth="yes"/>
-      <point x="2879" y="812"/>
-      <point x="2849" y="974"/>
-      <point x="2849" y="1313" type="curve" smooth="yes"/>
-      <point x="2849" y="1541"/>
-      <point x="2887" y="1606"/>
-      <point x="2895" y="1652" type="curve" smooth="yes"/>
-      <point x="2901" y="1679"/>
-      <point x="2879" y="1753"/>
-      <point x="2855" y="1720" type="curve" smooth="yes"/>
-      <point x="2806" y="1657"/>
-      <point x="2690" y="1417"/>
-    </contour>
-    <contour>
-      <point x="185" y="-26" type="curve" smooth="yes"/>
-      <point x="185" y="117"/>
-      <point x="210" y="202"/>
-      <point x="224" y="222" type="curve" smooth="yes"/>
-      <point x="249" y="258"/>
-      <point x="341" y="371"/>
-      <point x="529" y="461" type="curve" smooth="yes"/>
-      <point x="708" y="547"/>
-      <point x="924" y="586"/>
-      <point x="986" y="637" type="curve"/>
-      <point x="1033" y="684"/>
-      <point x="1063" y="747"/>
-      <point x="1063" y="851" type="curve" smooth="yes"/>
-      <point x="1063" y="1121"/>
-      <point x="988" y="981"/>
-      <point x="923" y="1020" type="curve" smooth="yes"/>
-      <point x="789" y="1095"/>
-      <point x="1217" y="1225"/>
-      <point x="1304" y="1455" type="curve"/>
-      <point x="1314" y="1526" type="line"/>
-      <point x="1358" y="1345"/>
-      <point x="1485" y="1192"/>
-      <point x="1598" y="1192" type="curve" smooth="yes"/>
-      <point x="1862" y="1192"/>
-      <point x="1966" y="1543"/>
-      <point x="2073" y="1543" type="curve" smooth="yes"/>
-      <point x="2110" y="1543"/>
-      <point x="2178" y="1486"/>
-      <point x="2229" y="1486" type="curve" smooth="yes"/>
-      <point x="2359" y="1486"/>
-      <point x="2452" y="1679"/>
-      <point x="2486" y="1679" type="curve" smooth="yes"/>
-      <point x="2508" y="1679"/>
-      <point x="2515" y="1659"/>
-      <point x="2578" y="1659" type="curve" smooth="yes"/>
-      <point x="2715" y="1659"/>
-      <point x="2808" y="1983"/>
-      <point x="2826" y="2108" type="curve" smooth="yes"/>
-      <point x="2828" y="2122"/>
-      <point x="2790" y="2143"/>
-      <point x="2788" y="2130" type="curve" smooth="yes"/>
-      <point x="2766" y="1990"/>
-      <point x="2691" y="1820"/>
-      <point x="2619" y="1820" type="curve" smooth="yes"/>
-      <point x="2538" y="1820"/>
-      <point x="2528" y="1892"/>
-      <point x="2499" y="1892" type="curve" smooth="yes"/>
-      <point x="2439" y="1892"/>
-      <point x="2365" y="1645"/>
-      <point x="2241" y="1645" type="curve" smooth="yes"/>
-      <point x="2203" y="1645"/>
-      <point x="2141" y="1695"/>
-      <point x="2103" y="1695" type="curve" smooth="yes"/>
-      <point x="1976" y="1695"/>
-      <point x="1905" y="1482"/>
-      <point x="1665" y="1482" type="curve" smooth="yes"/>
-      <point x="1500" y="1482"/>
-      <point x="1375" y="1667"/>
-      <point x="1363" y="1946" type="curve" smooth="yes"/>
-      <point x="1363" y="2102"/>
-      <point x="1363" y="2228"/>
-      <point x="1372" y="2453" type="curve" smooth="yes"/>
-      <point x="1378" y="2605"/>
-      <point x="1402" y="2650"/>
-      <point x="1410" y="2679" type="curve" smooth="yes"/>
-      <point x="1415" y="2697"/>
-      <point x="1397" y="2746"/>
-      <point x="1377" y="2724" type="curve" smooth="yes"/>
-      <point x="1337" y="2680"/>
-      <point x="1239" y="2521"/>
-      <point x="1229" y="2355" type="curve" smooth="yes"/>
-      <point x="1211" y="2044"/>
-      <point x="1223" y="1915"/>
-      <point x="1221" y="1691" type="curve" smooth="yes"/>
-      <point x="1218" y="1314"/>
-      <point x="615" y="1248"/>
-      <point x="615" y="894" type="curve" smooth="yes"/>
-      <point x="615" y="825"/>
-      <point x="641" y="801"/>
-      <point x="680" y="780" type="curve"/>
-      <point x="394" y="716"/>
-      <point x="42" y="432"/>
-      <point x="42" y="-69" type="curve" smooth="yes"/>
-      <point x="42" y="-358"/>
-      <point x="45" y="-882"/>
-      <point x="0" y="-1256" type="curve" smooth="yes"/>
-      <point x="-6" y="-1302"/>
-      <point x="66" y="-1261"/>
-      <point x="74" y="-1218" type="curve" smooth="yes"/>
-      <point x="151" y="-810"/>
-      <point x="185" y="-149"/>
-    </contour>
-    <contour>
-      <point x="2100" y="2670" type="curve" smooth="yes"/>
-      <point x="2097" y="2626"/>
-      <point x="2092" y="2438"/>
-      <point x="2015" y="2420" type="curve" smooth="yes"/>
-      <point x="1932" y="2401"/>
-      <point x="1941" y="2595"/>
-      <point x="1944" y="2635" type="curve" smooth="yes"/>
-      <point x="1945" y="2649"/>
-      <point x="1901" y="2640"/>
-      <point x="1897" y="2625" type="curve" smooth="yes"/>
-      <point x="1886" y="2584"/>
-      <point x="1866" y="2385"/>
-      <point x="1795" y="2369" type="curve" smooth="yes"/>
-      <point x="1711" y="2350"/>
-      <point x="1726" y="2547"/>
-      <point x="1736" y="2589" type="curve" smooth="yes"/>
-      <point x="1739" y="2602"/>
-      <point x="1692" y="2593"/>
-      <point x="1688" y="2578" type="curve" smooth="yes"/>
-      <point x="1662" y="2477"/>
-      <point x="1625" y="2217"/>
-      <point x="1790" y="2254" type="curve" smooth="yes"/>
-      <point x="1843" y="2266"/>
-      <point x="1872" y="2311"/>
-      <point x="1890" y="2349" type="curve"/>
-      <point x="1903" y="2325"/>
-      <point x="1935" y="2285"/>
-      <point x="2004" y="2301" type="curve" smooth="yes"/>
-      <point x="2166" y="2337"/>
-      <point x="2147" y="2638"/>
-      <point x="2147" y="2681" type="curve" smooth="yes"/>
-      <point x="2147" y="2694"/>
-      <point x="2101" y="2684"/>
-    </contour>
-    <contour>
-      <point x="1910" y="3279" type="curve" smooth="yes"/>
-      <point x="1900" y="3173"/>
-      <point x="1911" y="3015"/>
-      <point x="1902" y="2924" type="curve" smooth="yes"/>
-      <point x="1897" y="2860"/>
-      <point x="1879" y="2839"/>
-      <point x="1873" y="2826" type="curve"/>
-      <point x="1866" y="2809"/>
-      <point x="1908" y="2785"/>
-      <point x="1919" y="2798" type="curve"/>
-      <point x="1936" y="2820"/>
-      <point x="1983" y="2925"/>
-      <point x="1994" y="3041" type="curve" smooth="yes"/>
-      <point x="1999" y="3103"/>
-      <point x="1994" y="3226"/>
-      <point x="2001" y="3304" type="curve" smooth="yes"/>
-      <point x="2005" y="3344"/>
-      <point x="2009" y="3362"/>
-      <point x="2016" y="3370" type="curve"/>
-      <point x="2030" y="3390"/>
-      <point x="1995" y="3415"/>
-      <point x="1979" y="3403" type="curve"/>
-      <point x="1961" y="3388"/>
-      <point x="1915" y="3335"/>
-    </contour>
-    <contour>
-      <point x="3454" y="2896" type="curve" smooth="yes"/>
-      <point x="3400" y="2896"/>
-      <point x="3336" y="2885"/>
-      <point x="3278" y="2669" type="curve" smooth="yes"/>
-      <point x="3189" y="2337"/>
-      <point x="3311" y="2279"/>
-      <point x="3546" y="2362" type="curve" smooth="yes"/>
-      <point x="3563" y="2368"/>
-      <point x="3570" y="2354"/>
-      <point x="3570" y="2335" type="curve" smooth="yes"/>
-      <point x="3570" y="2199"/>
-      <point x="3179" y="2007"/>
-      <point x="3025" y="1944" type="curve" smooth="yes"/>
-      <point x="3003" y="1935"/>
-      <point x="3021" y="1894"/>
-      <point x="3043" y="1895" type="curve" smooth="yes"/>
-      <point x="3138" y="1899"/>
-      <point x="3426" y="1938"/>
-      <point x="3456" y="1968" type="curve" smooth="yes"/>
-      <point x="3504" y="2016"/>
-      <point x="3667" y="2251"/>
-      <point x="3667" y="2480" type="curve" smooth="yes"/>
-      <point x="3667" y="2660"/>
-      <point x="3602" y="2896"/>
-    </contour>
-    <contour>
-      <point x="5239" y="2775" type="curve" smooth="yes"/>
-      <point x="5236" y="2731"/>
-      <point x="5231" y="2543"/>
-      <point x="5154" y="2525" type="curve" smooth="yes"/>
-      <point x="5071" y="2506"/>
-      <point x="5080" y="2700"/>
-      <point x="5083" y="2740" type="curve" smooth="yes"/>
-      <point x="5084" y="2754"/>
-      <point x="5040" y="2745"/>
-      <point x="5036" y="2730" type="curve" smooth="yes"/>
-      <point x="5025" y="2689"/>
-      <point x="5005" y="2490"/>
-      <point x="4934" y="2474" type="curve" smooth="yes"/>
-      <point x="4850" y="2455"/>
-      <point x="4865" y="2652"/>
-      <point x="4875" y="2694" type="curve" smooth="yes"/>
-      <point x="4878" y="2707"/>
-      <point x="4831" y="2698"/>
-      <point x="4827" y="2683" type="curve" smooth="yes"/>
-      <point x="4801" y="2582"/>
-      <point x="4764" y="2322"/>
-      <point x="4929" y="2359" type="curve" smooth="yes"/>
-      <point x="4982" y="2371"/>
-      <point x="5011" y="2416"/>
-      <point x="5029" y="2454" type="curve"/>
-      <point x="5042" y="2430"/>
-      <point x="5074" y="2390"/>
-      <point x="5143" y="2406" type="curve" smooth="yes"/>
-      <point x="5305" y="2442"/>
-      <point x="5286" y="2743"/>
-      <point x="5286" y="2786" type="curve" smooth="yes"/>
-      <point x="5286" y="2799"/>
-      <point x="5240" y="2789"/>
-    </contour>
-    <contour>
-      <point x="3389" y="718" type="curve" smooth="yes"/>
-      <point x="3389" y="732"/>
-      <point x="3349" y="745"/>
-      <point x="3284" y="809" type="curve" smooth="yes"/>
-      <point x="3219" y="875"/>
-      <point x="3206" y="915"/>
-      <point x="3192" y="915" type="curve" smooth="yes"/>
-      <point x="3158" y="915"/>
-      <point x="3007" y="754"/>
-      <point x="3007" y="718" type="curve" smooth="yes"/>
-      <point x="3007" y="676"/>
-      <point x="3161" y="521"/>
-      <point x="3204" y="521" type="curve" smooth="yes"/>
-      <point x="3237" y="521"/>
-      <point x="3390" y="683"/>
-    </contour>
-    <contour>
-      <point x="3696" y="753" type="curve" smooth="yes"/>
-      <point x="3696" y="767"/>
-      <point x="3656" y="779"/>
-      <point x="3592" y="844" type="curve" smooth="yes"/>
-      <point x="3526" y="909"/>
-      <point x="3513" y="950"/>
-      <point x="3500" y="950" type="curve" smooth="yes"/>
-      <point x="3465" y="950"/>
-      <point x="3314" y="789"/>
-      <point x="3314" y="753" type="curve" smooth="yes"/>
-      <point x="3314" y="710"/>
-      <point x="3469" y="555"/>
-      <point x="3511" y="555" type="curve" smooth="yes"/>
-      <point x="3544" y="555"/>
-      <point x="3697" y="717"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
deleted file mode 100644
index 6a08a6c08..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.draft.glif
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem.draft" format="2">
-  <outline>
-    <contour>
-      <point x="1539" y="1707" type="curve" smooth="yes"/>
-      <point x="1539" y="1759"/>
-      <point x="1163" y="1749"/>
-      <point x="981" y="1666" type="curve" smooth="yes"/>
-      <point x="936" y="1646"/>
-      <point x="882" y="1517"/>
-      <point x="882" y="1479" type="curve" smooth="yes"/>
-      <point x="882" y="1475"/>
-      <point x="884" y="1473"/>
-      <point x="887" y="1473" type="curve" smooth="yes"/>
-      <point x="937" y="1473"/>
-      <point x="1083" y="1555"/>
-      <point x="1251" y="1555" type="curve" smooth="yes"/>
-      <point x="1353" y="1555"/>
-      <point x="1392" y="1550"/>
-      <point x="1392" y="1534" type="curve" smooth="yes"/>
-      <point x="1392" y="1417"/>
-      <point x="1190" y="1406"/>
-      <point x="948" y="1289" type="curve" smooth="yes"/>
-      <point x="763" y="1199"/>
-      <point x="712" y="1017"/>
-      <point x="712" y="957" type="curve" smooth="yes"/>
-      <point x="712" y="926"/>
-      <point x="732" y="901"/>
-      <point x="771" y="880" type="curve" smooth="yes"/>
-      <point x="798" y="865"/>
-      <point x="1065" y="1092"/>
-      <point x="1015" y="1121" type="curve" smooth="yes"/>
-      <point x="957" y="1153"/>
-      <point x="1101" y="1224"/>
-      <point x="1195" y="1266" type="curve" smooth="yes"/>
-      <point x="1388" y="1350"/>
-      <point x="1539" y="1567"/>
-    </contour>
-    <contour>
-      <point x="2116" y="3803" type="curve" smooth="yes"/>
-      <point x="1802" y="3563"/>
-      <point x="1732" y="3473"/>
-      <point x="1721" y="3299" type="curve" smooth="yes"/>
-      <point x="1720" y="3280"/>
-      <point x="1748" y="3258"/>
-      <point x="1757" y="3273" type="curve" smooth="yes"/>
-      <point x="1833" y="3397"/>
-      <point x="1850" y="3412"/>
-      <point x="2117" y="3612" type="curve" smooth="yes"/>
-      <point x="2434" y="3851"/>
-      <point x="2481" y="3943"/>
-      <point x="2495" y="4106" type="curve" smooth="yes"/>
-      <point x="2496" y="4124"/>
-      <point x="2469" y="4146"/>
-      <point x="2460" y="4131" type="curve" smooth="yes"/>
-      <point x="2386" y="4012"/>
-      <point x="2378" y="4005"/>
-    </contour>
-    <contour>
-      <point x="2077" y="1869" type="curve" smooth="yes"/>
-      <point x="2354" y="1869"/>
-      <point x="2644" y="2146"/>
-      <point x="2730" y="2413" type="curve" smooth="yes"/>
-      <point x="2740" y="2444"/>
-      <point x="2684" y="2463"/>
-      <point x="2674" y="2438" type="curve" smooth="yes"/>
-      <point x="2613" y="2285"/>
-      <point x="2377" y="2209"/>
-      <point x="2192" y="2209" type="curve" smooth="yes"/>
-      <point x="1947" y="2209"/>
-      <point x="1853" y="2354"/>
-      <point x="1843" y="2619" type="curve" smooth="yes"/>
-      <point x="1840" y="2702"/>
-      <point x="1740" y="2548"/>
-      <point x="1748" y="2458" type="curve" smooth="yes"/>
-      <point x="1776" y="2133"/>
-      <point x="1828" y="1869"/>
-    </contour>
-    <contour>
-      <point x="2489" y="2733" type="curve" smooth="yes"/>
-      <point x="2345" y="2733"/>
-      <point x="2233" y="2546"/>
-      <point x="2137" y="2430" type="curve" smooth="yes"/>
-      <point x="2034" y="2306"/>
-      <point x="2011" y="2246"/>
-      <point x="2011" y="2197" type="curve" smooth="yes"/>
-      <point x="2011" y="2116"/>
-      <point x="2065" y="2038"/>
-      <point x="2203" y="2008" type="curve"/>
-      <point x="2203" y="2008"/>
-      <point x="2499" y="2275"/>
-      <point x="2499" y="2275" type="curve"/>
-      <point x="2316" y="2189"/>
-      <point x="2226" y="2369"/>
-      <point x="2231" y="2445" type="curve" smooth="yes"/>
-      <point x="2234" y="2487"/>
-      <point x="2291" y="2596"/>
-      <point x="2391" y="2596" type="curve" smooth="yes"/>
-      <point x="2484" y="2596"/>
-      <point x="2506" y="2549"/>
-      <point x="2568" y="2549" type="curve" smooth="yes"/>
-      <point x="2690" y="2549"/>
-      <point x="2683" y="2733"/>
-    </contour>
-    <contour>
-      <point x="2256" y="3518" type="curve" smooth="yes"/>
-      <point x="1946" y="3296"/>
-      <point x="1691" y="2964"/>
-      <point x="1691" y="2404" type="curve" smooth="yes"/>
-      <point x="1691" y="2346"/>
-      <point x="1689" y="2251"/>
-      <point x="1668" y="2215" type="curve" smooth="yes"/>
-      <point x="1519" y="1958"/>
-      <point x="882" y="1996"/>
-      <point x="882" y="1479" type="curve" smooth="yes"/>
-      <point x="882" y="1466"/>
-      <point x="915" y="1484"/>
-      <point x="920" y="1497" type="curve" smooth="yes"/>
-      <point x="1065" y="1882"/>
-      <point x="1489" y="1761"/>
-      <point x="1725" y="2183" type="curve" smooth="yes"/>
-      <point x="1787" y="2294"/>
-      <point x="1843" y="2404"/>
-      <point x="1843" y="2619" type="curve" smooth="yes"/>
-      <point x="1843" y="2994"/>
-      <point x="1861" y="3050"/>
-      <point x="2249" y="3328" type="curve" smooth="yes"/>
-      <point x="2655" y="3619"/>
-      <point x="2777" y="3711"/>
-      <point x="2791" y="3955" type="curve" smooth="yes"/>
-      <point x="2792" y="3973"/>
-      <point x="2764" y="3995"/>
-      <point x="2755" y="3980" type="curve" smooth="yes"/>
-      <point x="2672" y="3841"/>
-      <point x="2634" y="3789"/>
-    </contour>
-    <contour>
-      <point x="142" y="31" type="curve" smooth="yes"/>
-      <point x="142" y="-258"/>
-      <point x="145" y="-712"/>
-      <point x="100" y="-1086" type="curve" smooth="yes"/>
-      <point x="94" y="-1132"/>
-      <point x="156" y="-1091"/>
-      <point x="164" y="-1048" type="curve" smooth="yes"/>
-      <point x="241" y="-640"/>
-      <point x="275" y="-49"/>
-      <point x="275" y="74" type="curve" smooth="yes"/>
-      <point x="275" y="217"/>
-      <point x="300" y="302"/>
-      <point x="314" y="322" type="curve" smooth="yes"/>
-      <point x="339" y="358"/>
-      <point x="431" y="471"/>
-      <point x="619" y="561" type="curve" smooth="yes"/>
-      <point x="798" y="647"/>
-      <point x="1014" y="686"/>
-      <point x="1076" y="737" type="curve" smooth="yes"/>
-      <point x="1121" y="774"/>
-      <point x="1162" y="852"/>
-      <point x="1162" y="956" type="curve" smooth="yes"/>
-      <point x="1162" y="1071"/>
-      <point x="954" y="1153"/>
-      <point x="924" y="1165" type="curve" smooth="yes"/>
-      <point x="901" y="1174"/>
-      <point x="712" y="999"/>
-      <point x="712" y="957" type="curve" smooth="yes"/>
-      <point x="712" y="926"/>
-      <point x="731" y="901"/>
-      <point x="770" y="880" type="curve"/>
-      <point x="484" y="816"/>
-      <point x="142" y="532"/>
-    </contour>
-    <contour>
-      <point x="1810" y="691" type="curve" smooth="yes"/>
-      <point x="1810" y="705"/>
-      <point x="1770" y="718"/>
-      <point x="1705" y="782" type="curve" smooth="yes"/>
-      <point x="1640" y="848"/>
-      <point x="1627" y="887"/>
-      <point x="1613" y="888" type="curve"/>
-      <point x="1579" y="888"/>
-      <point x="1428" y="727"/>
-      <point x="1428" y="691" type="curve" smooth="yes"/>
-      <point x="1428" y="649"/>
-      <point x="1582" y="493"/>
-      <point x="1625" y="493" type="curve" smooth="yes"/>
-      <point x="1658" y="493"/>
-      <point x="1811" y="655"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
deleted file mode 100644
index bb6e94a76..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inG_afJ_eemM_eem.glif
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem" format="2">
-  <outline>
-    <contour>
-      <point x="-488" y="1707" type="curve" smooth="yes"/>
-      <point x="-488" y="1759"/>
-      <point x="-864" y="1749"/>
-      <point x="-1046" y="1666" type="curve" smooth="yes"/>
-      <point x="-1091" y="1646"/>
-      <point x="-1145" y="1517"/>
-      <point x="-1145" y="1479" type="curve" smooth="yes"/>
-      <point x="-1145" y="1475"/>
-      <point x="-1143" y="1473"/>
-      <point x="-1140" y="1473" type="curve" smooth="yes"/>
-      <point x="-1090" y="1473"/>
-      <point x="-944" y="1555"/>
-      <point x="-776" y="1555" type="curve" smooth="yes"/>
-      <point x="-674" y="1555"/>
-      <point x="-635" y="1550"/>
-      <point x="-635" y="1534" type="curve" smooth="yes"/>
-      <point x="-635" y="1417"/>
-      <point x="-837" y="1406"/>
-      <point x="-1079" y="1289" type="curve" smooth="yes"/>
-      <point x="-1264" y="1199"/>
-      <point x="-1315" y="1017"/>
-      <point x="-1315" y="957" type="curve" smooth="yes"/>
-      <point x="-1315" y="926"/>
-      <point x="-1295" y="901"/>
-      <point x="-1256" y="880" type="curve" smooth="yes"/>
-      <point x="-1229" y="865"/>
-      <point x="-962" y="1092"/>
-      <point x="-1012" y="1121" type="curve" smooth="yes"/>
-      <point x="-1070" y="1153"/>
-      <point x="-926" y="1224"/>
-      <point x="-832" y="1266" type="curve" smooth="yes"/>
-      <point x="-639" y="1350"/>
-      <point x="-488" y="1567"/>
-    </contour>
-    <contour>
-      <point x="89" y="3803" type="curve" smooth="yes"/>
-      <point x="-225" y="3563"/>
-      <point x="-295" y="3473"/>
-      <point x="-306" y="3299" type="curve" smooth="yes"/>
-      <point x="-307" y="3280"/>
-      <point x="-279" y="3258"/>
-      <point x="-270" y="3273" type="curve" smooth="yes"/>
-      <point x="-194" y="3397"/>
-      <point x="-177" y="3412"/>
-      <point x="90" y="3612" type="curve" smooth="yes"/>
-      <point x="407" y="3851"/>
-      <point x="454" y="3943"/>
-      <point x="468" y="4106" type="curve" smooth="yes"/>
-      <point x="469" y="4124"/>
-      <point x="442" y="4146"/>
-      <point x="433" y="4131" type="curve" smooth="yes"/>
-      <point x="359" y="4012"/>
-      <point x="351" y="4005"/>
-    </contour>
-    <contour>
-      <point x="50" y="1869" type="curve" smooth="yes"/>
-      <point x="327" y="1869"/>
-      <point x="617" y="2146"/>
-      <point x="703" y="2413" type="curve" smooth="yes"/>
-      <point x="713" y="2444"/>
-      <point x="657" y="2463"/>
-      <point x="647" y="2438" type="curve" smooth="yes"/>
-      <point x="586" y="2285"/>
-      <point x="350" y="2209"/>
-      <point x="165" y="2209" type="curve" smooth="yes"/>
-      <point x="-80" y="2209"/>
-      <point x="-174" y="2354"/>
-      <point x="-184" y="2619" type="curve" smooth="yes"/>
-      <point x="-187" y="2702"/>
-      <point x="-287" y="2548"/>
-      <point x="-279" y="2458" type="curve" smooth="yes"/>
-      <point x="-251" y="2133"/>
-      <point x="-199" y="1869"/>
-    </contour>
-    <contour>
-      <point x="462" y="2733" type="curve" smooth="yes"/>
-      <point x="318" y="2733"/>
-      <point x="206" y="2546"/>
-      <point x="110" y="2430" type="curve" smooth="yes"/>
-      <point x="7" y="2306"/>
-      <point x="-16" y="2246"/>
-      <point x="-16" y="2197" type="curve" smooth="yes"/>
-      <point x="-16" y="2116"/>
-      <point x="38" y="2038"/>
-      <point x="176" y="2008" type="curve"/>
-      <point x="176" y="2008"/>
-      <point x="472" y="2275"/>
-      <point x="472" y="2275" type="curve"/>
-      <point x="289" y="2189"/>
-      <point x="199" y="2369"/>
-      <point x="204" y="2445" type="curve" smooth="yes"/>
-      <point x="207" y="2487"/>
-      <point x="264" y="2596"/>
-      <point x="364" y="2596" type="curve" smooth="yes"/>
-      <point x="457" y="2596"/>
-      <point x="479" y="2549"/>
-      <point x="541" y="2549" type="curve" smooth="yes"/>
-      <point x="663" y="2549"/>
-      <point x="656" y="2733"/>
-    </contour>
-    <contour>
-      <point x="229" y="3518" type="curve" smooth="yes"/>
-      <point x="-81" y="3296"/>
-      <point x="-336" y="2964"/>
-      <point x="-336" y="2404" type="curve" smooth="yes"/>
-      <point x="-336" y="2346"/>
-      <point x="-338" y="2251"/>
-      <point x="-359" y="2215" type="curve" smooth="yes"/>
-      <point x="-508" y="1958"/>
-      <point x="-1145" y="1996"/>
-      <point x="-1145" y="1479" type="curve" smooth="yes"/>
-      <point x="-1145" y="1466"/>
-      <point x="-1112" y="1484"/>
-      <point x="-1107" y="1497" type="curve" smooth="yes"/>
-      <point x="-962" y="1882"/>
-      <point x="-538" y="1761"/>
-      <point x="-302" y="2183" type="curve" smooth="yes"/>
-      <point x="-240" y="2294"/>
-      <point x="-184" y="2404"/>
-      <point x="-184" y="2619" type="curve" smooth="yes"/>
-      <point x="-184" y="2994"/>
-      <point x="-166" y="3050"/>
-      <point x="222" y="3328" type="curve" smooth="yes"/>
-      <point x="628" y="3619"/>
-      <point x="750" y="3711"/>
-      <point x="764" y="3955" type="curve" smooth="yes"/>
-      <point x="765" y="3973"/>
-      <point x="737" y="3995"/>
-      <point x="728" y="3980" type="curve" smooth="yes"/>
-      <point x="645" y="3841"/>
-      <point x="607" y="3789"/>
-    </contour>
-    <contour>
-      <point x="-1885" y="31" type="curve" smooth="yes"/>
-      <point x="-1885" y="-258"/>
-      <point x="-1882" y="-712"/>
-      <point x="-1927" y="-1086" type="curve" smooth="yes"/>
-      <point x="-1933" y="-1132"/>
-      <point x="-1871" y="-1091"/>
-      <point x="-1863" y="-1048" type="curve" smooth="yes"/>
-      <point x="-1786" y="-640"/>
-      <point x="-1752" y="-49"/>
-      <point x="-1752" y="74" type="curve" smooth="yes"/>
-      <point x="-1752" y="217"/>
-      <point x="-1727" y="302"/>
-      <point x="-1713" y="322" type="curve" smooth="yes"/>
-      <point x="-1688" y="358"/>
-      <point x="-1596" y="471"/>
-      <point x="-1408" y="561" type="curve" smooth="yes"/>
-      <point x="-1229" y="647"/>
-      <point x="-1013" y="686"/>
-      <point x="-951" y="737" type="curve" smooth="yes"/>
-      <point x="-906" y="774"/>
-      <point x="-865" y="852"/>
-      <point x="-865" y="956" type="curve" smooth="yes"/>
-      <point x="-865" y="1071"/>
-      <point x="-1073" y="1153"/>
-      <point x="-1103" y="1165" type="curve" smooth="yes"/>
-      <point x="-1126" y="1174"/>
-      <point x="-1315" y="999"/>
-      <point x="-1315" y="957" type="curve" smooth="yes"/>
-      <point x="-1315" y="926"/>
-      <point x="-1296" y="901"/>
-      <point x="-1257" y="880" type="curve"/>
-      <point x="-1543" y="816"/>
-      <point x="-1885" y="532"/>
-    </contour>
-    <contour>
-      <point x="-244" y="691" type="curve" smooth="yes"/>
-      <point x="-244" y="705"/>
-      <point x="-284" y="717"/>
-      <point x="-349" y="782" type="curve" smooth="yes"/>
-      <point x="-414" y="847"/>
-      <point x="-427" y="888"/>
-      <point x="-441" y="888" type="curve" smooth="yes"/>
-      <point x="-475" y="888"/>
-      <point x="-626" y="727"/>
-      <point x="-626" y="691" type="curve" smooth="yes"/>
-      <point x="-626" y="648"/>
-      <point x="-472" y="493"/>
-      <point x="-429" y="493" type="curve" smooth="yes"/>
-      <point x="-396" y="493"/>
-      <point x="-243" y="655"/>
-    </contour>
-    <contour>
-      <point x="1713" y="691" type="curve" smooth="yes"/>
-      <point x="1713" y="705"/>
-      <point x="1673" y="718"/>
-      <point x="1608" y="782" type="curve" smooth="yes"/>
-      <point x="1543" y="848"/>
-      <point x="1530" y="887"/>
-      <point x="1516" y="888" type="curve"/>
-      <point x="1482" y="888"/>
-      <point x="1331" y="727"/>
-      <point x="1331" y="691" type="curve" smooth="yes"/>
-      <point x="1331" y="649"/>
-      <point x="1485" y="493"/>
-      <point x="1528" y="493" type="curve" smooth="yes"/>
-      <point x="1561" y="493"/>
-      <point x="1714" y="655"/>
-    </contour>
-    <contour>
-      <point x="741" y="880" type="curve"/>
-      <point x="455" y="816"/>
-      <point x="113" y="532"/>
-      <point x="113" y="31" type="curve" smooth="yes"/>
-      <point x="113" y="-258"/>
-      <point x="116" y="-712"/>
-      <point x="71" y="-1086" type="curve" smooth="yes"/>
-      <point x="65" y="-1132"/>
-      <point x="127" y="-1091"/>
-      <point x="135" y="-1048" type="curve" smooth="yes"/>
-      <point x="212" y="-640"/>
-      <point x="246" y="-49"/>
-      <point x="246" y="74" type="curve" smooth="yes"/>
-      <point x="246" y="217"/>
-      <point x="271" y="302"/>
-      <point x="285" y="322" type="curve" smooth="yes"/>
-      <point x="310" y="358"/>
-      <point x="402" y="471"/>
-      <point x="590" y="561" type="curve" smooth="yes"/>
-      <point x="769" y="647"/>
-      <point x="985" y="686"/>
-      <point x="1047" y="737" type="curve" smooth="yes"/>
-      <point x="1092" y="774"/>
-      <point x="1133" y="852"/>
-      <point x="1133" y="956" type="curve" smooth="yes"/>
-      <point x="1133" y="1071"/>
-      <point x="925" y="1153"/>
-      <point x="895" y="1165" type="curve" smooth="yes"/>
-      <point x="872" y="1174"/>
-      <point x="683" y="999"/>
-      <point x="683" y="957" type="curve" smooth="yes"/>
-      <point x="683" y="926"/>
-      <point x="702" y="901"/>
-    </contour>
-    <contour>
-      <point x="1539" y="1789" type="curve" smooth="yes"/>
-      <point x="1539" y="1840"/>
-      <point x="1165" y="1814"/>
-      <point x="1072" y="1781" type="curve" smooth="yes"/>
-      <point x="977" y="1747"/>
-      <point x="852" y="1513"/>
-      <point x="852" y="1480" type="curve" smooth="yes"/>
-      <point x="852" y="1476"/>
-      <point x="854" y="1474"/>
-      <point x="857" y="1474" type="curve" smooth="yes"/>
-      <point x="907" y="1474"/>
-      <point x="1053" y="1557"/>
-      <point x="1221" y="1557" type="curve" smooth="yes"/>
-      <point x="1322" y="1557"/>
-      <point x="1362" y="1551"/>
-      <point x="1362" y="1535" type="curve" smooth="yes"/>
-      <point x="1362" y="1418"/>
-      <point x="1160" y="1407"/>
-      <point x="918" y="1290" type="curve" smooth="yes"/>
-      <point x="733" y="1200"/>
-      <point x="682" y="1018"/>
-      <point x="682" y="958" type="curve" smooth="yes"/>
-      <point x="682" y="927"/>
-      <point x="702" y="902"/>
-      <point x="741" y="881" type="curve" smooth="yes"/>
-      <point x="768" y="866"/>
-      <point x="1025" y="1097"/>
-      <point x="975" y="1126" type="curve" smooth="yes"/>
-      <point x="917" y="1158"/>
-      <point x="1071" y="1225"/>
-      <point x="1165" y="1267" type="curve" smooth="yes"/>
-      <point x="1358" y="1351"/>
-      <point x="1539" y="1649"/>
-    </contour>
-    <contour>
-      <point x="2726" y="3980" type="curve" smooth="yes"/>
-      <point x="2643" y="3841"/>
-      <point x="2605" y="3789"/>
-      <point x="2227" y="3518" type="curve" smooth="yes"/>
-      <point x="1917" y="3296"/>
-      <point x="1662" y="2964"/>
-      <point x="1662" y="2404" type="curve" smooth="yes"/>
-      <point x="1662" y="2346"/>
-      <point x="1660" y="2251"/>
-      <point x="1639" y="2215" type="curve" smooth="yes"/>
-      <point x="1510" y="1995"/>
-      <point x="853" y="2026"/>
-      <point x="853" y="1479" type="curve"/>
-      <point x="868" y="1479"/>
-      <point x="886" y="1484"/>
-      <point x="891" y="1497" type="curve" smooth="yes"/>
-      <point x="1054" y="1921"/>
-      <point x="1479" y="1795"/>
-      <point x="1696" y="2183" type="curve" smooth="yes"/>
-      <point x="1758" y="2294"/>
-      <point x="1814" y="2404"/>
-      <point x="1814" y="2619" type="curve" smooth="yes"/>
-      <point x="1814" y="2994"/>
-      <point x="1832" y="3050"/>
-      <point x="2220" y="3328" type="curve" smooth="yes"/>
-      <point x="2626" y="3619"/>
-      <point x="2748" y="3711"/>
-      <point x="2762" y="3955" type="curve" smooth="yes"/>
-      <point x="2763" y="3973"/>
-      <point x="2735" y="3995"/>
-    </contour>
-    <contour>
-      <point x="2087" y="3803" type="curve" smooth="yes"/>
-      <point x="1773" y="3563"/>
-      <point x="1703" y="3473"/>
-      <point x="1692" y="3299" type="curve" smooth="yes"/>
-      <point x="1691" y="3280"/>
-      <point x="1719" y="3258"/>
-      <point x="1728" y="3273" type="curve" smooth="yes"/>
-      <point x="1804" y="3397"/>
-      <point x="1821" y="3412"/>
-      <point x="2088" y="3612" type="curve" smooth="yes"/>
-      <point x="2405" y="3851"/>
-      <point x="2452" y="3943"/>
-      <point x="2466" y="4106" type="curve" smooth="yes"/>
-      <point x="2467" y="4124"/>
-      <point x="2440" y="4146"/>
-      <point x="2431" y="4131" type="curve" smooth="yes"/>
-      <point x="2357" y="4012"/>
-      <point x="2349" y="4005"/>
-    </contour>
-    <contour>
-      <point x="2152" y="2455" type="curve" smooth="yes"/>
-      <point x="2056" y="2327"/>
-      <point x="2034" y="2253"/>
-      <point x="2034" y="2204" type="curve" smooth="yes"/>
-      <point x="2034" y="2123"/>
-      <point x="2081" y="2049"/>
-      <point x="2219" y="2019" type="curve"/>
-      <point x="2230" y="2028"/>
-      <point x="2505" y="2258"/>
-      <point x="2539" y="2295" type="curve"/>
-      <point x="2523" y="2286"/>
-      <point x="2507" y="2279"/>
-      <point x="2496" y="2276" type="curve" smooth="yes"/>
-      <point x="2360" y="2234"/>
-      <point x="2247" y="2332"/>
-      <point x="2247" y="2456" type="curve" smooth="yes"/>
-      <point x="2247" y="2498"/>
-      <point x="2306" y="2607"/>
-      <point x="2407" y="2607" type="curve" smooth="yes"/>
-      <point x="2500" y="2607"/>
-      <point x="2522" y="2560"/>
-      <point x="2584" y="2560" type="curve" smooth="yes"/>
-      <point x="2706" y="2560"/>
-      <point x="2699" y="2744"/>
-      <point x="2504" y="2744" type="curve" smooth="yes"/>
-      <point x="2369" y="2744"/>
-      <point x="2239" y="2571"/>
-    </contour>
-    <contour>
-      <point x="2046" y="1871" type="curve" smooth="yes"/>
-      <point x="2323" y="1871"/>
-      <point x="2613" y="2148"/>
-      <point x="2699" y="2415" type="curve" smooth="yes"/>
-      <point x="2704" y="2431"/>
-      <point x="2680" y="2446"/>
-      <point x="2674" y="2430" type="curve" smooth="yes"/>
-      <point x="2613" y="2277"/>
-      <point x="2346" y="2211"/>
-      <point x="2161" y="2211" type="curve" smooth="yes"/>
-      <point x="1916" y="2211"/>
-      <point x="1822" y="2356"/>
-      <point x="1812" y="2621" type="curve" smooth="yes"/>
-      <point x="1809" y="2704"/>
-      <point x="1703" y="2550"/>
-      <point x="1711" y="2460" type="curve" smooth="yes"/>
-      <point x="1739" y="2135"/>
-      <point x="1797" y="1871"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
deleted file mode 100644
index fe42a96f6..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_inK_afB_ehR_eh.glif
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinKafBehReh" format="2">
-  <outline>
-    <contour>
-      <point x="1016" y="626" type="curve" smooth="yes"/>
-      <point x="686" y="296"/>
-      <point x="670" y="-264"/>
-      <point x="104" y="-578" type="curve" smooth="yes"/>
-      <point x="86" y="-588"/>
-      <point x="137" y="-608"/>
-      <point x="158" y="-598" type="curve" smooth="yes"/>
-      <point x="597" y="-389"/>
-      <point x="726" y="115"/>
-      <point x="1016" y="373" type="curve" smooth="yes"/>
-      <point x="1052" y="405"/>
-      <point x="1055" y="665"/>
-    </contour>
-    <contour>
-      <point x="1285" y="734" type="curve" smooth="yes"/>
-      <point x="1172" y="734"/>
-      <point x="1084" y="698"/>
-      <point x="1012" y="622" type="curve" smooth="yes"/>
-      <point x="979" y="588"/>
-      <point x="963" y="324"/>
-      <point x="1012" y="369" type="curve" smooth="yes"/>
-      <point x="1147" y="490"/>
-      <point x="1236" y="382"/>
-      <point x="1380" y="382" type="curve" smooth="yes"/>
-      <point x="1440" y="382"/>
-      <point x="1432" y="715"/>
-      <point x="1380" y="724" type="curve" smooth="yes"/>
-      <point x="1355" y="729"/>
-      <point x="1329" y="734"/>
-    </contour>
-    <contour>
-      <point x="1373" y="383" type="curve" smooth="yes"/>
-      <point x="1549" y="383"/>
-      <point x="1683" y="549"/>
-      <point x="1749" y="707" type="curve" smooth="yes"/>
-      <point x="1810" y="853"/>
-      <point x="1853" y="1091"/>
-      <point x="1853" y="1271" type="curve" smooth="yes"/>
-      <point x="1853" y="1408"/>
-      <point x="1854" y="1541"/>
-      <point x="1864" y="1642" type="curve" smooth="yes"/>
-      <point x="1885" y="1855"/>
-      <point x="1944" y="1919"/>
-      <point x="2277" y="2158" type="curve" smooth="yes"/>
-      <point x="2683" y="2449"/>
-      <point x="2804" y="2541"/>
-      <point x="2819" y="2785" type="curve" smooth="yes"/>
-      <point x="2820" y="2803"/>
-      <point x="2792" y="2825"/>
-      <point x="2783" y="2810" type="curve" smooth="yes"/>
-      <point x="2698" y="2672"/>
-      <point x="2662" y="2619"/>
-      <point x="2284" y="2348" type="curve" smooth="yes"/>
-      <point x="2005" y="2148"/>
-      <point x="1713" y="1800"/>
-      <point x="1713" y="1302" type="curve" smooth="yes"/>
-      <point x="1713" y="985"/>
-      <point x="1724" y="807"/>
-      <point x="1684" y="735" type="curve" smooth="yes"/>
-      <point x="1665" y="701"/>
-      <point x="1630" y="667"/>
-      <point x="1572" y="667" type="curve" smooth="yes"/>
-      <point x="1484" y="667"/>
-      <point x="1437" y="712"/>
-      <point x="1373" y="725" type="curve" smooth="yes"/>
-      <point x="1335" y="732"/>
-      <point x="1328" y="383"/>
-    </contour>
-    <contour>
-      <point x="2194" y="1073" type="curve" smooth="yes"/>
-      <point x="2098" y="945"/>
-      <point x="2076" y="871"/>
-      <point x="2076" y="822" type="curve" smooth="yes"/>
-      <point x="2076" y="741"/>
-      <point x="2123" y="667"/>
-      <point x="2261" y="637" type="curve"/>
-      <point x="2272" y="646"/>
-      <point x="2547" y="876"/>
-      <point x="2581" y="913" type="curve"/>
-      <point x="2565" y="904"/>
-      <point x="2549" y="897"/>
-      <point x="2538" y="894" type="curve" smooth="yes"/>
-      <point x="2402" y="852"/>
-      <point x="2289" y="950"/>
-      <point x="2289" y="1074" type="curve" smooth="yes"/>
-      <point x="2289" y="1116"/>
-      <point x="2348" y="1225"/>
-      <point x="2449" y="1225" type="curve" smooth="yes"/>
-      <point x="2542" y="1225"/>
-      <point x="2564" y="1178"/>
-      <point x="2626" y="1178" type="curve" smooth="yes"/>
-      <point x="2748" y="1178"/>
-      <point x="2741" y="1362"/>
-      <point x="2546" y="1362" type="curve" smooth="yes"/>
-      <point x="2411" y="1362"/>
-      <point x="2281" y="1189"/>
-    </contour>
-    <contour>
-      <point x="2088" y="489" type="curve" smooth="yes"/>
-      <point x="2365" y="489"/>
-      <point x="2655" y="766"/>
-      <point x="2741" y="1033" type="curve" smooth="yes"/>
-      <point x="2746" y="1049"/>
-      <point x="2722" y="1064"/>
-      <point x="2716" y="1048" type="curve" smooth="yes"/>
-      <point x="2655" y="895"/>
-      <point x="2388" y="829"/>
-      <point x="2203" y="829" type="curve" smooth="yes"/>
-      <point x="1958" y="829"/>
-      <point x="1864" y="974"/>
-      <point x="1854" y="1239" type="curve" smooth="yes"/>
-      <point x="1851" y="1322"/>
-      <point x="1745" y="1168"/>
-      <point x="1753" y="1078" type="curve" smooth="yes"/>
-      <point x="1781" y="753"/>
-      <point x="1839" y="489"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
deleted file mode 100644
index 4bb9fde78..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.draft.glif
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh.draft" format="2">
-  <outline>
-    <contour>
-      <point x="3280" y="850" type="curve" smooth="yes"/>
-      <point x="3237" y="764"/>
-      <point x="3407" y="901"/>
-      <point x="3419" y="949" type="curve" smooth="yes"/>
-      <point x="3514" y="1327"/>
-      <point x="3698" y="1504"/>
-      <point x="3791" y="1504" type="curve" smooth="yes"/>
-      <point x="3884" y="1504"/>
-      <point x="3908" y="1459"/>
-      <point x="3908" y="1405" type="curve" smooth="yes"/>
-      <point x="3908" y="1189"/>
-      <point x="3117" y="1022"/>
-      <point x="3117" y="458" type="curve" smooth="yes"/>
-      <point x="3117" y="446"/>
-      <point x="3154" y="447"/>
-      <point x="3154" y="458" type="curve" smooth="yes"/>
-      <point x="3154" y="901"/>
-      <point x="4058" y="960"/>
-      <point x="4058" y="1505" type="curve" smooth="yes"/>
-      <point x="4058" y="1626"/>
-      <point x="4011" y="1700"/>
-      <point x="3886" y="1700" type="curve" smooth="yes"/>
-      <point x="3566" y="1700"/>
-      <point x="3455" y="1196"/>
-    </contour>
-    <contour>
-      <point x="4405" y="1366" type="curve" smooth="yes"/>
-      <point x="4384" y="1055"/>
-      <point x="4411" y="753"/>
-      <point x="4395" y="482" type="curve" smooth="yes"/>
-      <point x="4384" y="293"/>
-      <point x="4344" y="231"/>
-      <point x="4335" y="194" type="curve" smooth="yes"/>
-      <point x="4331" y="176"/>
-      <point x="4363" y="136"/>
-      <point x="4377" y="156" type="curve" smooth="yes"/>
-      <point x="4423" y="220"/>
-      <point x="4515" y="516"/>
-      <point x="4536" y="860" type="curve" smooth="yes"/>
-      <point x="4547" y="1042"/>
-      <point x="4549" y="1237"/>
-      <point x="4549" y="1463" type="curve" smooth="yes"/>
-      <point x="4549" y="1615"/>
-      <point x="4580" y="1658"/>
-      <point x="4587" y="1689" type="curve" smooth="yes"/>
-      <point x="4592" y="1707"/>
-      <point x="4574" y="1756"/>
-      <point x="4554" y="1734" type="curve" smooth="yes"/>
-      <point x="4513" y="1692"/>
-      <point x="4416" y="1532"/>
-    </contour>
-    <contour>
-      <point x="3426" y="2254" type="curve" smooth="yes"/>
-      <point x="3403" y="1826"/>
-      <point x="3492" y="1225"/>
-      <point x="3248" y="823" type="curve" smooth="yes"/>
-      <point x="3237" y="805"/>
-      <point x="3302" y="779"/>
-      <point x="3317" y="801" type="curve" smooth="yes"/>
-      <point x="3576" y="1178"/>
-      <point x="3572" y="1878"/>
-      <point x="3570" y="2350" type="curve" smooth="yes"/>
-      <point x="3569" y="2502"/>
-      <point x="3599" y="2546"/>
-      <point x="3607" y="2576" type="curve" smooth="yes"/>
-      <point x="3611" y="2594"/>
-      <point x="3592" y="2644"/>
-      <point x="3572" y="2622" type="curve" smooth="yes"/>
-      <point x="3532" y="2579"/>
-      <point x="3435" y="2419"/>
-    </contour>
-    <contour>
-      <point x="2963" y="792" type="curve" smooth="yes"/>
-      <point x="3054" y="792"/>
-      <point x="3119" y="619"/>
-      <point x="3119" y="458" type="curve" smooth="yes"/>
-      <point x="3119" y="448"/>
-      <point x="3153" y="448"/>
-      <point x="3153" y="458" type="curve" smooth="yes"/>
-      <point x="3153" y="479"/>
-      <point x="3185" y="979"/>
-      <point x="2976" y="979" type="curve" smooth="yes"/>
-      <point x="2810" y="979"/>
-      <point x="2602" y="355"/>
-      <point x="2179" y="448" type="curve" smooth="yes"/>
-      <point x="2105" y="464"/>
-      <point x="2038" y="305"/>
-      <point x="2090" y="293" type="curve" smooth="yes"/>
-      <point x="2584" y="175"/>
-      <point x="2795" y="792"/>
-    </contour>
-    <contour>
-      <point x="3010" y="265" type="curve" smooth="yes"/>
-      <point x="2819" y="-74"/>
-      <point x="2882" y="-242"/>
-      <point x="3012" y="-242" type="curve" smooth="yes"/>
-      <point x="3148" y="-242"/>
-      <point x="3146" y="-15"/>
-      <point x="3091" y="-15" type="curve" smooth="yes"/>
-      <point x="3052" y="-15"/>
-      <point x="3051" y="-79"/>
-      <point x="3019" y="-79" type="curve" smooth="yes"/>
-      <point x="2960" y="-79"/>
-      <point x="2954" y="18"/>
-      <point x="3049" y="252" type="curve" smooth="yes"/>
-      <point x="3053" y="261"/>
-      <point x="3016" y="276"/>
-    </contour>
-    <contour>
-      <point x="2034" y="316" type="curve" smooth="yes"/>
-      <point x="2063" y="316"/>
-      <point x="2204" y="446"/>
-      <point x="2179" y="448" type="curve" smooth="yes"/>
-      <point x="2044" y="457"/>
-      <point x="1954" y="612"/>
-      <point x="1954" y="706" type="curve" smooth="yes"/>
-      <point x="1954" y="801"/>
-      <point x="2062" y="867"/>
-      <point x="2162" y="867" type="curve" smooth="yes"/>
-      <point x="2262" y="867"/>
-      <point x="2314" y="807"/>
-      <point x="2314" y="724" type="curve" smooth="yes"/>
-      <point x="2314" y="514"/>
-      <point x="1831" y="332"/>
-      <point x="1121" y="332" type="curve" smooth="yes"/>
-      <point x="748" y="332"/>
-      <point x="136" y="317"/>
-      <point x="224" y="774" type="curve" smooth="yes"/>
-      <point x="228" y="798"/>
-      <point x="179" y="840"/>
-      <point x="172" y="817" type="curve" smooth="yes"/>
-      <point x="16" y="291"/>
-      <point x="49" y="-8"/>
-      <point x="953" y="-8" type="curve" smooth="yes"/>
-      <point x="1988" y="-8"/>
-      <point x="2399" y="304"/>
-      <point x="2399" y="816" type="curve" smooth="yes"/>
-      <point x="2399" y="934"/>
-      <point x="2351" y="1060"/>
-      <point x="2216" y="1060" type="curve" smooth="yes"/>
-      <point x="2044" y="1060"/>
-      <point x="1859" y="762"/>
-      <point x="1860" y="559" type="curve" smooth="yes"/>
-      <point x="1861" y="381"/>
-      <point x="2000" y="316"/>
-    </contour>
-    <contour>
-      <point x="3280" y="850" type="curve" smooth="yes"/>
-      <point x="3237" y="764"/>
-      <point x="3407" y="901"/>
-      <point x="3419" y="949" type="curve" smooth="yes"/>
-      <point x="3514" y="1327"/>
-      <point x="3698" y="1504"/>
-      <point x="3791" y="1504" type="curve" smooth="yes"/>
-      <point x="3884" y="1504"/>
-      <point x="3908" y="1459"/>
-      <point x="3908" y="1405" type="curve" smooth="yes"/>
-      <point x="3908" y="1189"/>
-      <point x="3117" y="1022"/>
-      <point x="3117" y="458" type="curve" smooth="yes"/>
-      <point x="3117" y="446"/>
-      <point x="3154" y="447"/>
-      <point x="3154" y="458" type="curve" smooth="yes"/>
-      <point x="3154" y="901"/>
-      <point x="4058" y="960"/>
-      <point x="4058" y="1505" type="curve" smooth="yes"/>
-      <point x="4058" y="1626"/>
-      <point x="4011" y="1700"/>
-      <point x="3886" y="1700" type="curve" smooth="yes"/>
-      <point x="3566" y="1700"/>
-      <point x="3455" y="1196"/>
-    </contour>
-    <contour>
-      <point x="2378" y="1603" type="curve" smooth="yes"/>
-      <point x="2378" y="1617"/>
-      <point x="2338" y="1630"/>
-      <point x="2273" y="1694" type="curve" smooth="yes"/>
-      <point x="2208" y="1760"/>
-      <point x="2195" y="1799"/>
-      <point x="2181" y="1800" type="curve"/>
-      <point x="2147" y="1800"/>
-      <point x="1996" y="1639"/>
-      <point x="1996" y="1603" type="curve" smooth="yes"/>
-      <point x="1996" y="1561"/>
-      <point x="2150" y="1405"/>
-      <point x="2193" y="1405" type="curve" smooth="yes"/>
-      <point x="2226" y="1405"/>
-      <point x="2379" y="1567"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
deleted file mode 100644
index 56281db8d..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testA_lefT_ahH_ehgoalF_eh.glif
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh" format="2">
-  <outline>
-    <contour>
-      <point x="2378" y="1603" type="curve" smooth="yes"/>
-      <point x="2378" y="1617"/>
-      <point x="2338" y="1630"/>
-      <point x="2273" y="1694" type="curve" smooth="yes"/>
-      <point x="2208" y="1760"/>
-      <point x="2195" y="1799"/>
-      <point x="2181" y="1800" type="curve"/>
-      <point x="2147" y="1800"/>
-      <point x="1996" y="1639"/>
-      <point x="1996" y="1603" type="curve" smooth="yes"/>
-      <point x="1996" y="1561"/>
-      <point x="2150" y="1405"/>
-      <point x="2193" y="1405" type="curve" smooth="yes"/>
-      <point x="2226" y="1405"/>
-      <point x="2379" y="1567"/>
-    </contour>
-    <contour>
-      <point x="957" y="-10" type="curve" smooth="yes"/>
-      <point x="1992" y="-10"/>
-      <point x="2403" y="302"/>
-      <point x="2403" y="814" type="curve" smooth="yes"/>
-      <point x="2403" y="932"/>
-      <point x="2355" y="1058"/>
-      <point x="2220" y="1058" type="curve" smooth="yes"/>
-      <point x="2048" y="1058"/>
-      <point x="1863" y="760"/>
-      <point x="1864" y="557" type="curve" smooth="yes"/>
-      <point x="1865" y="379"/>
-      <point x="1999" y="296"/>
-      <point x="2095" y="296" type="curve" smooth="yes"/>
-      <point x="2124" y="296"/>
-      <point x="2214" y="457"/>
-      <point x="2189" y="462" type="curve" smooth="yes"/>
-      <point x="2045" y="492"/>
-      <point x="1958" y="546"/>
-      <point x="1958" y="704" type="curve" smooth="yes"/>
-      <point x="1958" y="799"/>
-      <point x="2066" y="865"/>
-      <point x="2166" y="865" type="curve" smooth="yes"/>
-      <point x="2266" y="865"/>
-      <point x="2318" y="805"/>
-      <point x="2318" y="722" type="curve" smooth="yes"/>
-      <point x="2318" y="512"/>
-      <point x="1835" y="330"/>
-      <point x="1125" y="330" type="curve" smooth="yes"/>
-      <point x="752" y="330"/>
-      <point x="140" y="315"/>
-      <point x="228" y="772" type="curve" smooth="yes"/>
-      <point x="232" y="796"/>
-      <point x="183" y="838"/>
-      <point x="176" y="815" type="curve" smooth="yes"/>
-      <point x="20" y="289"/>
-      <point x="53" y="-10"/>
-    </contour>
-    <contour>
-      <point x="3010" y="265" type="curve" smooth="yes"/>
-      <point x="2819" y="-74"/>
-      <point x="2882" y="-242"/>
-      <point x="3012" y="-242" type="curve" smooth="yes"/>
-      <point x="3148" y="-242"/>
-      <point x="3146" y="-15"/>
-      <point x="3091" y="-15" type="curve" smooth="yes"/>
-      <point x="3052" y="-15"/>
-      <point x="3051" y="-79"/>
-      <point x="3019" y="-79" type="curve" smooth="yes"/>
-      <point x="2960" y="-79"/>
-      <point x="2954" y="18"/>
-      <point x="3049" y="252" type="curve" smooth="yes"/>
-      <point x="3053" y="261"/>
-      <point x="3016" y="276"/>
-    </contour>
-    <contour>
-      <point x="2289" y="437" type="curve" smooth="yes"/>
-      <point x="2249" y="437"/>
-      <point x="2214" y="439"/>
-      <point x="2177" y="449" type="curve" smooth="yes"/>
-      <point x="2150" y="456"/>
-      <point x="2065" y="283"/>
-      <point x="2084" y="283" type="curve" smooth="yes"/>
-      <point x="2678" y="283"/>
-      <point x="2793" y="789"/>
-      <point x="2961" y="789" type="curve" smooth="yes"/>
-      <point x="3052" y="789"/>
-      <point x="3117" y="616"/>
-      <point x="3117" y="455" type="curve" smooth="yes"/>
-      <point x="3117" y="445"/>
-      <point x="3151" y="445"/>
-      <point x="3151" y="455" type="curve" smooth="yes"/>
-      <point x="3151" y="476"/>
-      <point x="3183" y="986"/>
-      <point x="2974" y="986" type="curve" smooth="yes"/>
-      <point x="2819" y="986"/>
-      <point x="2671" y="437"/>
-    </contour>
-    <contour>
-      <point x="3427" y="2246" type="curve" smooth="yes"/>
-      <point x="3404" y="1818"/>
-      <point x="3493" y="1217"/>
-      <point x="3249" y="815" type="curve" smooth="yes"/>
-      <point x="3238" y="797"/>
-      <point x="3303" y="771"/>
-      <point x="3318" y="793" type="curve" smooth="yes"/>
-      <point x="3577" y="1170"/>
-      <point x="3573" y="1870"/>
-      <point x="3571" y="2342" type="curve" smooth="yes"/>
-      <point x="3570" y="2494"/>
-      <point x="3600" y="2538"/>
-      <point x="3608" y="2568" type="curve" smooth="yes"/>
-      <point x="3612" y="2586"/>
-      <point x="3593" y="2636"/>
-      <point x="3573" y="2614" type="curve" smooth="yes"/>
-      <point x="3533" y="2571"/>
-      <point x="3436" y="2411"/>
-    </contour>
-    <contour>
-      <point x="3281" y="842" type="curve" smooth="yes"/>
-      <point x="3238" y="756"/>
-      <point x="3408" y="893"/>
-      <point x="3420" y="941" type="curve" smooth="yes"/>
-      <point x="3515" y="1319"/>
-      <point x="3699" y="1496"/>
-      <point x="3792" y="1496" type="curve" smooth="yes"/>
-      <point x="3885" y="1496"/>
-      <point x="3909" y="1451"/>
-      <point x="3909" y="1397" type="curve" smooth="yes"/>
-      <point x="3909" y="1181"/>
-      <point x="3118" y="1014"/>
-      <point x="3118" y="450" type="curve" smooth="yes"/>
-      <point x="3118" y="438"/>
-      <point x="3155" y="439"/>
-      <point x="3155" y="450" type="curve" smooth="yes"/>
-      <point x="3155" y="893"/>
-      <point x="4059" y="952"/>
-      <point x="4059" y="1497" type="curve" smooth="yes"/>
-      <point x="4059" y="1618"/>
-      <point x="4012" y="1692"/>
-      <point x="3887" y="1692" type="curve" smooth="yes"/>
-      <point x="3567" y="1692"/>
-      <point x="3456" y="1188"/>
-    </contour>
-    <contour>
-      <point x="4408" y="1366" type="curve" smooth="yes"/>
-      <point x="4387" y="1055"/>
-      <point x="4414" y="753"/>
-      <point x="4398" y="482" type="curve" smooth="yes"/>
-      <point x="4387" y="293"/>
-      <point x="4347" y="231"/>
-      <point x="4338" y="194" type="curve" smooth="yes"/>
-      <point x="4334" y="176"/>
-      <point x="4366" y="136"/>
-      <point x="4380" y="156" type="curve" smooth="yes"/>
-      <point x="4426" y="220"/>
-      <point x="4518" y="516"/>
-      <point x="4539" y="860" type="curve" smooth="yes"/>
-      <point x="4550" y="1042"/>
-      <point x="4552" y="1237"/>
-      <point x="4552" y="1463" type="curve" smooth="yes"/>
-      <point x="4552" y="1615"/>
-      <point x="4583" y="1658"/>
-      <point x="4590" y="1689" type="curve" smooth="yes"/>
-      <point x="4595" y="1707"/>
-      <point x="4577" y="1756"/>
-      <point x="4557" y="1734" type="curve" smooth="yes"/>
-      <point x="4516" y="1692"/>
-      <point x="4419" y="1532"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
deleted file mode 100644
index 712444c85..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testD_alS_eenB_ariyeh.glif
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testDalSeenBariyeh" format="2">
-  <outline>
-    <contour>
-      <point x="1095" y="-10" type="curve" smooth="yes"/>
-      <point x="1743" y="-10"/>
-      <point x="2508" y="208"/>
-      <point x="2694" y="396" type="curve" smooth="yes"/>
-      <point x="2710" y="412"/>
-      <point x="2685" y="443"/>
-      <point x="2662" y="440" type="curve" smooth="yes"/>
-      <point x="2479" y="407"/>
-      <point x="1853" y="330"/>
-      <point x="1283" y="330" type="curve" smooth="yes"/>
-      <point x="685" y="330"/>
-      <point x="154" y="360"/>
-      <point x="198" y="458" type="curve" smooth="yes"/>
-      <point x="207" y="478"/>
-      <point x="160" y="558"/>
-      <point x="134" y="481" type="curve" smooth="yes"/>
-      <point x="114" y="423"/>
-      <point x="103" y="370"/>
-      <point x="103" y="323" type="curve" smooth="yes"/>
-      <point x="103" y="81"/>
-      <point x="387" y="-10"/>
-    </contour>
-    <contour>
-      <point x="934" y="900" type="curve" smooth="yes"/>
-      <point x="896" y="900"/>
-      <point x="875" y="920"/>
-      <point x="837" y="920" type="curve" smooth="yes"/>
-      <point x="717" y="920"/>
-      <point x="837" y="849"/>
-      <point x="393" y="763" type="curve" smooth="yes"/>
-      <point x="275" y="740"/>
-      <point x="202" y="682"/>
-      <point x="134" y="484" type="curve" smooth="yes"/>
-      <point x="129" y="471"/>
-      <point x="193" y="447"/>
-      <point x="198" y="461" type="curve"/>
-      <point x="236" y="545"/>
-      <point x="249" y="591"/>
-      <point x="365" y="616" type="curve" smooth="yes"/>
-      <point x="787" y="711"/>
-      <point x="708" y="768"/>
-      <point x="807" y="768" type="curve" smooth="yes"/>
-      <point x="844" y="768"/>
-      <point x="876" y="740"/>
-      <point x="923" y="740" type="curve" smooth="yes"/>
-      <point x="956" y="740"/>
-      <point x="974" y="900"/>
-    </contour>
-    <contour>
-      <point x="1232" y="863" type="curve" smooth="yes"/>
-      <point x="1369" y="863"/>
-      <point x="1461" y="1147"/>
-      <point x="1479" y="1272" type="curve" smooth="yes"/>
-      <point x="1481" y="1286"/>
-      <point x="1443" y="1307"/>
-      <point x="1441" y="1294" type="curve" smooth="yes"/>
-      <point x="1419" y="1154"/>
-      <point x="1344" y="1024"/>
-      <point x="1272" y="1024" type="curve"/>
-      <point x="1192" y="1023"/>
-      <point x="1182" y="1097"/>
-      <point x="1153" y="1097" type="curve" smooth="yes"/>
-      <point x="1093" y="1097"/>
-      <point x="1059" y="900"/>
-      <point x="934" y="900" type="curve" smooth="yes"/>
-      <point x="907" y="900"/>
-      <point x="884" y="740"/>
-      <point x="923" y="740" type="curve" smooth="yes"/>
-      <point x="1053" y="740"/>
-      <point x="1106" y="884"/>
-      <point x="1140" y="884" type="curve" smooth="yes"/>
-      <point x="1162" y="884"/>
-      <point x="1169" y="863"/>
-    </contour>
-    <contour>
-      <point x="3030" y="1036" type="curve" smooth="yes"/>
-      <point x="2991" y="1036"/>
-      <point x="2934" y="779"/>
-      <point x="2934" y="736" type="curve" smooth="yes"/>
-      <point x="2934" y="710"/>
-      <point x="3164" y="713"/>
-      <point x="3164" y="393" type="curve" smooth="yes"/>
-      <point x="3164" y="340"/>
-      <point x="2650" y="57"/>
-      <point x="2622" y="43" type="curve" smooth="yes"/>
-      <point x="2602" y="33"/>
-      <point x="2619" y="-10"/>
-      <point x="2641" y="-5" type="curve" smooth="yes"/>
-      <point x="2675" y="1"/>
-      <point x="2997" y="41"/>
-      <point x="3069" y="117" type="curve" smooth="yes"/>
-      <point x="3146" y="198"/>
-      <point x="3327" y="474"/>
-      <point x="3327" y="722" type="curve" smooth="yes"/>
-      <point x="3327" y="886"/>
-      <point x="3150" y="1036"/>
-    </contour>
-    <contour>
-      <point x="3137" y="1571" type="curve" smooth="yes"/>
-      <point x="3137" y="1585"/>
-      <point x="3097" y="1598"/>
-      <point x="3032" y="1662" type="curve" smooth="yes"/>
-      <point x="2967" y="1728"/>
-      <point x="2954" y="1767"/>
-      <point x="2940" y="1768" type="curve"/>
-      <point x="2906" y="1768"/>
-      <point x="2755" y="1607"/>
-      <point x="2755" y="1571" type="curve" smooth="yes"/>
-      <point x="2755" y="1529"/>
-      <point x="2909" y="1373"/>
-      <point x="2952" y="1373" type="curve" smooth="yes"/>
-      <point x="2985" y="1373"/>
-      <point x="3138" y="1535"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
deleted file mode 100644
index 0f429a309..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.draft.glif
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh.draft" format="2">
-  <anchor x="615" y="1792" name="mUpper"/>
-  <anchor x="1475" y="290" name="n1Lower"/>
-  <anchor x="1423" y="1601" name="nUpper"/>
-  <anchor x="600" y="861" name="tahUpper"/>
-  <outline>
-    <contour>
-      <point x="1423" y="978" type="curve"/>
-      <point x="1421" y="983"/>
-      <point x="1397" y="838"/>
-      <point x="1400" y="835" type="curve" smooth="yes"/>
-      <point x="1759" y="421"/>
-      <point x="2033" y="1257"/>
-      <point x="2250" y="1193" type="curve" smooth="yes"/>
-      <point x="2317" y="1173"/>
-      <point x="2317" y="1399"/>
-      <point x="2250" y="1419" type="curve" smooth="yes"/>
-      <point x="2024" y="1486"/>
-      <point x="1837" y="467"/>
-    </contour>
-    <contour>
-      <point x="2431" y="2105" type="curve" smooth="yes"/>
-      <point x="2377" y="2105"/>
-      <point x="2313" y="2094"/>
-      <point x="2255" y="1878" type="curve" smooth="yes"/>
-      <point x="2166" y="1546"/>
-      <point x="2290" y="1483"/>
-      <point x="2523" y="1571" type="curve" smooth="yes"/>
-      <point x="2540" y="1578"/>
-      <point x="2547" y="1563"/>
-      <point x="2547" y="1544" type="curve" smooth="yes"/>
-      <point x="2547" y="1428"/>
-      <point x="2442" y="1400"/>
-      <point x="2379" y="1400" type="curve" smooth="yes"/>
-      <point x="2332" y="1400"/>
-      <point x="2294" y="1406"/>
-      <point x="2250" y="1419" type="curve" smooth="yes"/>
-      <point x="2213" y="1430"/>
-      <point x="2213" y="1204"/>
-      <point x="2250" y="1193" type="curve" smooth="yes"/>
-      <point x="2463" y="1130"/>
-      <point x="2644" y="1401"/>
-      <point x="2644" y="1687" type="curve" smooth="yes"/>
-      <point x="2644" y="1869"/>
-      <point x="2579" y="2105"/>
-    </contour>
-    <contour>
-      <point x="565" y="1421" type="curve" smooth="yes"/>
-      <point x="555" y="1245"/>
-      <point x="603" y="1010"/>
-      <point x="429" y="887" type="curve" smooth="yes"/>
-      <point x="423" y="882"/>
-      <point x="469" y="871"/>
-      <point x="478" y="878" type="curve" smooth="yes"/>
-      <point x="665" y="1010"/>
-      <point x="651" y="1262"/>
-      <point x="651" y="1455" type="curve" smooth="yes"/>
-      <point x="650" y="1517"/>
-      <point x="653" y="1535"/>
-      <point x="656" y="1548" type="curve" smooth="yes"/>
-      <point x="657" y="1555"/>
-      <point x="643" y="1581"/>
-      <point x="634" y="1572" type="curve" smooth="yes"/>
-      <point x="618" y="1554"/>
-      <point x="568" y="1488"/>
-    </contour>
-    <contour>
-      <point x="614" y="876" type="curve" smooth="yes"/>
-      <point x="735" y="906"/>
-      <point x="844" y="1025"/>
-      <point x="844" y="1114" type="curve" smooth="yes"/>
-      <point x="844" y="1163"/>
-      <point x="814" y="1204"/>
-      <point x="763" y="1204" type="curve" smooth="yes"/>
-      <point x="632" y="1204"/>
-      <point x="572" y="1023"/>
-      <point x="471" y="898" type="curve" smooth="yes"/>
-      <point x="446" y="867"/>
-      <point x="522" y="887"/>
-      <point x="532" y="905" type="curve" smooth="yes"/>
-      <point x="609" y="1054"/>
-      <point x="670" y="1113"/>
-      <point x="724" y="1113" type="curve" smooth="yes"/>
-      <point x="762" y="1113"/>
-      <point x="772" y="1095"/>
-      <point x="772" y="1073" type="curve" smooth="yes"/>
-      <point x="772" y="984"/>
-      <point x="626" y="949"/>
-      <point x="362" y="897" type="curve" smooth="yes"/>
-      <point x="340" y="893"/>
-      <point x="352" y="846"/>
-      <point x="366" y="846" type="curve" smooth="yes"/>
-      <point x="411" y="846"/>
-      <point x="504" y="850"/>
-    </contour>
-    <contour>
-      <point x="1630" y="1069" type="curve" smooth="yes"/>
-      <point x="1630" y="1154"/>
-      <point x="1575" y="1269"/>
-      <point x="1460" y="1269" type="curve" smooth="yes"/>
-      <point x="1292" y="1269"/>
-      <point x="1056" y="1104"/>
-      <point x="1056" y="1062" type="curve" smooth="yes"/>
-      <point x="1056" y="1050"/>
-      <point x="1065" y="1036"/>
-      <point x="1072" y="1039" type="curve" smooth="yes"/>
-      <point x="1105" y="1054"/>
-      <point x="1137" y="1061"/>
-      <point x="1169" y="1061" type="curve" smooth="yes"/>
-      <point x="1292" y="1061"/>
-      <point x="1307" y="927"/>
-      <point x="1399" y="835" type="curve"/>
-      <point x="1269" y="816"/>
-      <point x="1182" y="794"/>
-      <point x="1016" y="627" type="curve" smooth="yes"/>
-      <point x="940" y="550"/>
-      <point x="945" y="310"/>
-      <point x="1016" y="374" type="curve" smooth="yes"/>
-      <point x="1149" y="493"/>
-      <point x="1234" y="566"/>
-      <point x="1335" y="604" type="curve" smooth="yes"/>
-      <point x="1547" y="684"/>
-      <point x="1630" y="807"/>
-    </contour>
-    <contour>
-      <point x="158" y="-598" type="curve" smooth="yes"/>
-      <point x="597" y="-389"/>
-      <point x="726" y="115"/>
-      <point x="1016" y="373" type="curve" smooth="yes"/>
-      <point x="1052" y="405"/>
-      <point x="1055" y="665"/>
-      <point x="1016" y="626" type="curve" smooth="yes"/>
-      <point x="686" y="296"/>
-      <point x="670" y="-264"/>
-      <point x="104" y="-578" type="curve" smooth="yes"/>
-      <point x="86" y="-588"/>
-      <point x="137" y="-608"/>
-    </contour>
-    <contour>
-      <point x="2434" y="2533" type="curve" smooth="yes"/>
-      <point x="2434" y="2547"/>
-      <point x="2394" y="2560"/>
-      <point x="2329" y="2624" type="curve" smooth="yes"/>
-      <point x="2264" y="2690"/>
-      <point x="2251" y="2730"/>
-      <point x="2237" y="2730" type="curve" smooth="yes"/>
-      <point x="2203" y="2730"/>
-      <point x="2052" y="2569"/>
-      <point x="2052" y="2533" type="curve" smooth="yes"/>
-      <point x="2052" y="2491"/>
-      <point x="2206" y="2336"/>
-      <point x="2249" y="2336" type="curve" smooth="yes"/>
-      <point x="2282" y="2336"/>
-      <point x="2435" y="2498"/>
-    </contour>
-    <contour>
-      <point x="2741" y="2568" type="curve" smooth="yes"/>
-      <point x="2741" y="2582"/>
-      <point x="2701" y="2594"/>
-      <point x="2637" y="2659" type="curve" smooth="yes"/>
-      <point x="2571" y="2724"/>
-      <point x="2558" y="2765"/>
-      <point x="2545" y="2765" type="curve" smooth="yes"/>
-      <point x="2510" y="2765"/>
-      <point x="2359" y="2604"/>
-      <point x="2359" y="2568" type="curve" smooth="yes"/>
-      <point x="2359" y="2525"/>
-      <point x="2514" y="2370"/>
-      <point x="2556" y="2370" type="curve" smooth="yes"/>
-      <point x="2589" y="2370"/>
-      <point x="2742" y="2532"/>
-    </contour>
-    <contour>
-      <point x="2017" y="1803" type="curve" smooth="yes"/>
-      <point x="2017" y="1817"/>
-      <point x="1977" y="1830"/>
-      <point x="1912" y="1894" type="curve" smooth="yes"/>
-      <point x="1847" y="1960"/>
-      <point x="1834" y="1999"/>
-      <point x="1820" y="2000" type="curve"/>
-      <point x="1786" y="2000"/>
-      <point x="1635" y="1839"/>
-      <point x="1635" y="1803" type="curve" smooth="yes"/>
-      <point x="1635" y="1761"/>
-      <point x="1789" y="1605"/>
-      <point x="1832" y="1605" type="curve" smooth="yes"/>
-      <point x="1865" y="1605"/>
-      <point x="2018" y="1767"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
deleted file mode 100644
index db07861ad..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testF_ehB_ehA_inR_eh.glif
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh" format="2">
-  <outline>
-    <contour>
-      <point x="2434" y="2602" type="curve" smooth="yes"/>
-      <point x="2434" y="2616"/>
-      <point x="2394" y="2629"/>
-      <point x="2329" y="2693" type="curve" smooth="yes"/>
-      <point x="2264" y="2759"/>
-      <point x="2251" y="2799"/>
-      <point x="2237" y="2799" type="curve" smooth="yes"/>
-      <point x="2203" y="2799"/>
-      <point x="2052" y="2638"/>
-      <point x="2052" y="2602" type="curve" smooth="yes"/>
-      <point x="2052" y="2560"/>
-      <point x="2206" y="2405"/>
-      <point x="2249" y="2405" type="curve" smooth="yes"/>
-      <point x="2282" y="2405"/>
-      <point x="2435" y="2567"/>
-    </contour>
-    <contour>
-      <point x="2741" y="2637" type="curve" smooth="yes"/>
-      <point x="2741" y="2651"/>
-      <point x="2701" y="2663"/>
-      <point x="2637" y="2728" type="curve" smooth="yes"/>
-      <point x="2571" y="2793"/>
-      <point x="2558" y="2834"/>
-      <point x="2545" y="2834" type="curve" smooth="yes"/>
-      <point x="2510" y="2834"/>
-      <point x="2359" y="2673"/>
-      <point x="2359" y="2637" type="curve" smooth="yes"/>
-      <point x="2359" y="2594"/>
-      <point x="2514" y="2439"/>
-      <point x="2556" y="2439" type="curve" smooth="yes"/>
-      <point x="2589" y="2439"/>
-      <point x="2742" y="2601"/>
-    </contour>
-    <contour>
-      <point x="2017" y="1802" type="curve" smooth="yes"/>
-      <point x="2017" y="1816"/>
-      <point x="1977" y="1829"/>
-      <point x="1912" y="1893" type="curve" smooth="yes"/>
-      <point x="1847" y="1959"/>
-      <point x="1834" y="1998"/>
-      <point x="1820" y="1999" type="curve"/>
-      <point x="1786" y="1999"/>
-      <point x="1635" y="1838"/>
-      <point x="1635" y="1802" type="curve" smooth="yes"/>
-      <point x="1635" y="1760"/>
-      <point x="1789" y="1604"/>
-      <point x="1832" y="1604" type="curve" smooth="yes"/>
-      <point x="1865" y="1604"/>
-      <point x="2018" y="1766"/>
-    </contour>
-    <contour>
-      <point x="1016" y="626" type="curve" smooth="yes"/>
-      <point x="686" y="296"/>
-      <point x="670" y="-264"/>
-      <point x="104" y="-578" type="curve" smooth="yes"/>
-      <point x="86" y="-588"/>
-      <point x="137" y="-608"/>
-      <point x="158" y="-598" type="curve" smooth="yes"/>
-      <point x="597" y="-389"/>
-      <point x="726" y="115"/>
-      <point x="1016" y="373" type="curve" smooth="yes"/>
-      <point x="1052" y="405"/>
-      <point x="1055" y="665"/>
-    </contour>
-    <contour>
-      <point x="1020" y="377" type="curve" smooth="yes"/>
-      <point x="1153" y="496"/>
-      <point x="1238" y="563"/>
-      <point x="1339" y="607" type="curve" smooth="yes"/>
-      <point x="1485" y="671"/>
-      <point x="1634" y="862"/>
-      <point x="1634" y="1072" type="curve" smooth="yes"/>
-      <point x="1634" y="1097"/>
-      <point x="1403" y="883"/>
-      <point x="1403" y="838" type="curve"/>
-      <point x="1273" y="819"/>
-      <point x="1186" y="797"/>
-      <point x="1020" y="630" type="curve" smooth="yes"/>
-      <point x="944" y="553"/>
-      <point x="949" y="313"/>
-    </contour>
-    <contour>
-      <point x="1403" y="838" type="curve"/>
-      <point x="1403" y="755"/>
-      <point x="1634" y="1008"/>
-      <point x="1634" y="1072" type="curve" smooth="yes"/>
-      <point x="1634" y="1157"/>
-      <point x="1579" y="1272"/>
-      <point x="1464" y="1272" type="curve" smooth="yes"/>
-      <point x="1296" y="1272"/>
-      <point x="1060" y="1107"/>
-      <point x="1060" y="1065" type="curve" smooth="yes"/>
-      <point x="1060" y="1053"/>
-      <point x="1070" y="1039"/>
-      <point x="1076" y="1042" type="curve" smooth="yes"/>
-      <point x="1109" y="1057"/>
-      <point x="1141" y="1064"/>
-      <point x="1173" y="1064" type="curve" smooth="yes"/>
-      <point x="1296" y="1064"/>
-      <point x="1311" y="930"/>
-    </contour>
-    <contour>
-      <point x="2257" y="1413" type="curve" smooth="yes"/>
-      <point x="2031" y="1480"/>
-      <point x="1833" y="526"/>
-      <point x="1430" y="972" type="curve"/>
-      <point x="1428" y="977"/>
-      <point x="1404" y="832"/>
-      <point x="1407" y="829" type="curve"/>
-      <point x="1731" y="464"/>
-      <point x="2040" y="1251"/>
-      <point x="2257" y="1187" type="curve" smooth="yes"/>
-      <point x="2324" y="1167"/>
-      <point x="2324" y="1393"/>
-    </contour>
-    <contour>
-      <point x="2541" y="1541" type="curve" smooth="yes"/>
-      <point x="2541" y="1425"/>
-      <point x="2450" y="1387"/>
-      <point x="2387" y="1387" type="curve" smooth="yes"/>
-      <point x="2340" y="1387"/>
-      <point x="2297" y="1400"/>
-      <point x="2244" y="1416" type="curve" smooth="yes"/>
-      <point x="2207" y="1427"/>
-      <point x="2207" y="1201"/>
-      <point x="2244" y="1190" type="curve" smooth="yes"/>
-      <point x="2266" y="1184"/>
-      <point x="2296" y="1169"/>
-      <point x="2322" y="1169" type="curve" smooth="yes"/>
-      <point x="2506" y="1169"/>
-      <point x="2638" y="1427"/>
-      <point x="2638" y="1684" type="curve" smooth="yes"/>
-      <point x="2638" y="1866"/>
-      <point x="2573" y="2102"/>
-      <point x="2425" y="2102" type="curve" smooth="yes"/>
-      <point x="2371" y="2102"/>
-      <point x="2307" y="2091"/>
-      <point x="2249" y="1875" type="curve" smooth="yes"/>
-      <point x="2160" y="1543"/>
-      <point x="2284" y="1480"/>
-      <point x="2517" y="1568" type="curve" smooth="yes"/>
-      <point x="2534" y="1575"/>
-      <point x="2541" y="1560"/>
-    </contour>
-    <contour>
-      <point x="572" y="1430" type="curve" smooth="yes"/>
-      <point x="562" y="1254"/>
-      <point x="610" y="1019"/>
-      <point x="436" y="896" type="curve"/>
-      <point x="430" y="891"/>
-      <point x="476" y="880"/>
-      <point x="485" y="887" type="curve" smooth="yes"/>
-      <point x="672" y="1019"/>
-      <point x="658" y="1271"/>
-      <point x="658" y="1464" type="curve" smooth="yes"/>
-      <point x="657" y="1526"/>
-      <point x="673" y="1544"/>
-      <point x="676" y="1557" type="curve"/>
-      <point x="677" y="1564"/>
-      <point x="663" y="1590"/>
-      <point x="654" y="1581" type="curve"/>
-      <point x="638" y="1563"/>
-      <point x="575" y="1497"/>
-    </contour>
-    <contour>
-      <point x="621" y="885" type="curve" smooth="yes"/>
-      <point x="742" y="915"/>
-      <point x="851" y="1034"/>
-      <point x="851" y="1123" type="curve" smooth="yes"/>
-      <point x="851" y="1172"/>
-      <point x="821" y="1213"/>
-      <point x="770" y="1213" type="curve" smooth="yes"/>
-      <point x="639" y="1213"/>
-      <point x="579" y="1032"/>
-      <point x="478" y="907" type="curve" smooth="yes"/>
-      <point x="453" y="876"/>
-      <point x="529" y="896"/>
-      <point x="539" y="914" type="curve" smooth="yes"/>
-      <point x="616" y="1063"/>
-      <point x="677" y="1122"/>
-      <point x="731" y="1122" type="curve" smooth="yes"/>
-      <point x="769" y="1122"/>
-      <point x="779" y="1104"/>
-      <point x="779" y="1082" type="curve" smooth="yes"/>
-      <point x="779" y="993"/>
-      <point x="633" y="958"/>
-      <point x="369" y="906" type="curve" smooth="yes"/>
-      <point x="347" y="902"/>
-      <point x="359" y="855"/>
-      <point x="373" y="855" type="curve" smooth="yes"/>
-      <point x="418" y="855"/>
-      <point x="511" y="859"/>
-    </contour>
-    <contour>
-      <point x="1324" y="1774" type="curve" smooth="yes"/>
-      <point x="1452" y="1857"/>
-      <point x="1520" y="1934"/>
-      <point x="1520" y="2021" type="curve" smooth="yes"/>
-      <point x="1520" y="2039"/>
-      <point x="1497" y="2071"/>
-      <point x="1485" y="2050" type="curve"/>
-      <point x="1453" y="2000"/>
-      <point x="1443" y="1973"/>
-      <point x="1324" y="1896" type="curve" smooth="yes"/>
-      <point x="1195" y="1813"/>
-      <point x="1127" y="1736"/>
-      <point x="1127" y="1649" type="curve" smooth="yes"/>
-      <point x="1127" y="1632"/>
-      <point x="1150" y="1599"/>
-      <point x="1163" y="1620" type="curve" smooth="yes"/>
-      <point x="1194" y="1671"/>
-      <point x="1204" y="1697"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
deleted file mode 100644
index 363d1a58c..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehdoD_alH_ehdoA_inJ_eem.glif
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehdoDalHehdoAinJeem" format="2">
-  <outline>
-    <contour>
-      <point x="2145" y="52" type="curve" smooth="yes"/>
-      <point x="2369" y="52"/>
-      <point x="2615" y="628"/>
-      <point x="2615" y="719" type="curve" smooth="yes"/>
-      <point x="2615" y="810"/>
-      <point x="2584" y="937"/>
-      <point x="2409" y="937" type="curve" smooth="yes"/>
-      <point x="2229" y="937"/>
-      <point x="2131" y="651"/>
-      <point x="2131" y="535" type="curve" smooth="yes"/>
-      <point x="2131" y="419"/>
-      <point x="2220" y="285"/>
-      <point x="2411" y="285" type="curve" smooth="yes"/>
-      <point x="2541" y="285"/>
-      <point x="2905" y="374"/>
-      <point x="2905" y="561" type="curve" smooth="yes"/>
-      <point x="2905" y="727"/>
-      <point x="2480" y="879"/>
-      <point x="2437" y="1024" type="curve" smooth="yes"/>
-      <point x="2430" y="1045"/>
-      <point x="2395" y="1050"/>
-      <point x="2387" y="1029" type="curve" smooth="yes"/>
-      <point x="2371" y="988"/>
-      <point x="2350" y="847"/>
-      <point x="2365" y="819" type="curve" smooth="yes"/>
-      <point x="2394" y="762"/>
-      <point x="2863" y="659"/>
-      <point x="2821" y="500" type="curve" smooth="yes"/>
-      <point x="2812" y="466"/>
-      <point x="2579" y="444"/>
-      <point x="2478" y="444" type="curve" smooth="yes"/>
-      <point x="2377" y="444"/>
-      <point x="2220" y="511"/>
-      <point x="2220" y="633" type="curve" smooth="yes"/>
-      <point x="2220" y="696"/>
-      <point x="2290" y="743"/>
-      <point x="2381" y="743" type="curve" smooth="yes"/>
-      <point x="2442" y="743"/>
-      <point x="2518" y="702"/>
-      <point x="2518" y="652" type="curve" smooth="yes"/>
-      <point x="2518" y="552"/>
-      <point x="2333" y="385"/>
-      <point x="2224" y="385" type="curve" smooth="yes"/>
-      <point x="1988" y="385"/>
-      <point x="1921" y="523"/>
-      <point x="1910" y="802" type="curve" smooth="yes"/>
-      <point x="1907" y="884"/>
-      <point x="1807" y="672"/>
-      <point x="1813" y="592" type="curve" smooth="yes"/>
-      <point x="1837" y="267"/>
-      <point x="1971" y="52"/>
-    </contour>
-    <contour>
-      <point x="1932" y="973" type="curve" smooth="yes"/>
-      <point x="1935" y="988"/>
-      <point x="1888" y="995"/>
-      <point x="1884" y="976" type="curve" smooth="yes"/>
-      <point x="1748" y="403"/>
-      <point x="1589" y="238"/>
-      <point x="1208" y="43" type="curve" smooth="yes"/>
-      <point x="1188" y="33"/>
-      <point x="1212" y="-10"/>
-      <point x="1234" y="-2" type="curve" smooth="yes"/>
-      <point x="1267" y="11"/>
-      <point x="1646" y="71"/>
-      <point x="1710" y="136" type="curve" smooth="yes"/>
-      <point x="1782" y="209"/>
-      <point x="1840" y="387"/>
-      <point x="1847" y="427" type="curve"/>
-      <point x="1941" y="300"/>
-      <point x="1923" y="671"/>
-      <point x="1916" y="796" type="curve" smooth="yes"/>
-      <point x="1913" y="839"/>
-      <point x="1922" y="929"/>
-    </contour>
-    <contour>
-      <point x="1697" y="1629" type="curve" smooth="yes"/>
-      <point x="1697" y="1795"/>
-      <point x="1272" y="1947"/>
-      <point x="1229" y="2092" type="curve" smooth="yes"/>
-      <point x="1222" y="2113"/>
-      <point x="1187" y="2118"/>
-      <point x="1179" y="2097" type="curve" smooth="yes"/>
-      <point x="1163" y="2056"/>
-      <point x="1142" y="1915"/>
-      <point x="1157" y="1887" type="curve" smooth="yes"/>
-      <point x="1186" y="1830"/>
-      <point x="1655" y="1727"/>
-      <point x="1613" y="1568" type="curve" smooth="yes"/>
-      <point x="1604" y="1534"/>
-      <point x="1372" y="1512"/>
-      <point x="1270" y="1512" type="curve" smooth="yes"/>
-      <point x="1169" y="1512"/>
-      <point x="1012" y="1569"/>
-      <point x="1012" y="1701" type="curve" smooth="yes"/>
-      <point x="1012" y="1764"/>
-      <point x="1082" y="1811"/>
-      <point x="1173" y="1811" type="curve" smooth="yes"/>
-      <point x="1234" y="1811"/>
-      <point x="1310" y="1770"/>
-      <point x="1310" y="1720" type="curve" smooth="yes"/>
-      <point x="1310" y="1493"/>
-      <point x="887" y="847"/>
-      <point x="588" y="1200" type="curve" smooth="yes"/>
-      <point x="559" y="1236"/>
-      <point x="534" y="1091"/>
-      <point x="554" y="1071" type="curve" smooth="yes"/>
-      <point x="929" y="688"/>
-      <point x="1407" y="1533"/>
-      <point x="1407" y="1787" type="curve" smooth="yes"/>
-      <point x="1407" y="1878"/>
-      <point x="1376" y="2005"/>
-      <point x="1201" y="2005" type="curve" smooth="yes"/>
-      <point x="1021" y="2005"/>
-      <point x="923" y="1719"/>
-      <point x="923" y="1603" type="curve" smooth="yes"/>
-      <point x="923" y="1487"/>
-      <point x="1013" y="1353"/>
-      <point x="1204" y="1353" type="curve" smooth="yes"/>
-      <point x="1334" y="1353"/>
-      <point x="1697" y="1454"/>
-    </contour>
-    <contour>
-      <point x="-190" y="462" type="curve"/>
-      <point x="-170" y="462"/>
-      <point x="-137" y="473"/>
-      <point x="-129" y="500" type="curve" smooth="yes"/>
-      <point x="-76" y="682"/>
-      <point x="104" y="780"/>
-      <point x="401" y="908" type="curve" smooth="yes"/>
-      <point x="627" y="1005"/>
-      <point x="739" y="1231"/>
-      <point x="739" y="1379" type="curve" smooth="yes"/>
-      <point x="739" y="1425"/>
-      <point x="508" y="1200"/>
-      <point x="508" y="1145" type="curve" smooth="yes"/>
-      <point x="508" y="1131"/>
-      <point x="490" y="1097"/>
-      <point x="456" y="1078" type="curve" smooth="yes"/>
-      <point x="100" y="881"/>
-      <point x="-190" y="738"/>
-    </contour>
-    <contour>
-      <point x="508" y="1145" type="curve"/>
-      <point x="508" y="1062"/>
-      <point x="739" y="1315"/>
-      <point x="739" y="1379" type="curve" smooth="yes"/>
-      <point x="739" y="1464"/>
-      <point x="684" y="1579"/>
-      <point x="569" y="1579" type="curve" smooth="yes"/>
-      <point x="401" y="1579"/>
-      <point x="165" y="1414"/>
-      <point x="165" y="1372" type="curve" smooth="yes"/>
-      <point x="165" y="1360"/>
-      <point x="175" y="1346"/>
-      <point x="181" y="1349" type="curve" smooth="yes"/>
-      <point x="214" y="1364"/>
-      <point x="246" y="1371"/>
-      <point x="278" y="1371" type="curve" smooth="yes"/>
-      <point x="401" y="1371"/>
-      <point x="416" y="1237"/>
-    </contour>
-    <contour>
-      <point x="-203" y="-329" type="curve" smooth="yes"/>
-      <point x="-203" y="18"/>
-      <point x="-19" y="447"/>
-      <point x="563" y="775" type="curve" smooth="yes"/>
-      <point x="583" y="786"/>
-      <point x="561" y="854"/>
-      <point x="522" y="849" type="curve" smooth="yes"/>
-      <point x="495" y="846"/>
-      <point x="469" y="845"/>
-      <point x="441" y="845" type="curve" smooth="yes"/>
-      <point x="222" y="845"/>
-      <point x="151" y="872"/>
-      <point x="-18" y="818" type="curve" smooth="yes"/>
-      <point x="-40" y="811"/>
-      <point x="-194" y="587"/>
-      <point x="-194" y="547" type="curve" smooth="yes"/>
-      <point x="-194" y="534"/>
-      <point x="-188" y="531"/>
-      <point x="-182" y="531" type="curve" smooth="yes"/>
-      <point x="-153" y="531"/>
-      <point x="-126" y="579"/>
-      <point x="16" y="579" type="curve" smooth="yes"/>
-      <point x="69" y="579"/>
-      <point x="133" y="565"/>
-      <point x="168" y="565" type="curve"/>
-      <point x="-155" y="292"/>
-      <point x="-342" y="-113"/>
-      <point x="-342" y="-485" type="curve" smooth="yes"/>
-      <point x="-342" y="-893"/>
-      <point x="-146" y="-1234"/>
-      <point x="257" y="-1234" type="curve" smooth="yes"/>
-      <point x="733" y="-1234"/>
-      <point x="998" y="-685"/>
-      <point x="1124" y="-199" type="curve" smooth="yes"/>
-      <point x="1137" y="-156"/>
-      <point x="1089" y="-130"/>
-      <point x="1083" y="-160" type="curve"/>
-      <point x="989" y="-462"/>
-      <point x="735" y="-894"/>
-      <point x="319" y="-894" type="curve" smooth="yes"/>
-      <point x="-14" y="-894"/>
-      <point x="-203" y="-648"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
deleted file mode 100644
index 685dd942c..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testH_ehgoalS_adQ_af.glif
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehgoalSadQaf" format="2">
-  <outline>
-    <contour>
-      <point x="1514" y="660" type="curve" smooth="yes"/>
-      <point x="1514" y="477"/>
-      <point x="1279" y="-259"/>
-      <point x="703" y="-259" type="curve" smooth="yes"/>
-      <point x="161" y="-259"/>
-      <point x="158" y="399"/>
-      <point x="340" y="853" type="curve" smooth="yes"/>
-      <point x="352" y="883"/>
-      <point x="323" y="905"/>
-      <point x="312" y="905" type="curve" smooth="yes"/>
-      <point x="277" y="905"/>
-      <point x="103" y="470"/>
-      <point x="103" y="136" type="curve" smooth="yes"/>
-      <point x="103" y="-283"/>
-      <point x="300" y="-600"/>
-      <point x="635" y="-600" type="curve" smooth="yes"/>
-      <point x="1175" y="-600"/>
-      <point x="1592" y="174"/>
-      <point x="1592" y="789" type="curve" smooth="yes"/>
-      <point x="1592" y="1076"/>
-      <point x="1471" y="1225"/>
-      <point x="1369" y="1225" type="curve" smooth="yes"/>
-      <point x="1315" y="1225"/>
-      <point x="1229" y="1221"/>
-      <point x="1172" y="1003" type="curve" smooth="yes"/>
-      <point x="1070" y="639"/>
-      <point x="1229" y="530"/>
-      <point x="1494" y="670" type="curve" smooth="yes"/>
-      <point x="1509" y="678"/>
-      <point x="1514" y="668"/>
-    </contour>
-    <contour>
-      <point x="1827" y="1045" type="curve" smooth="yes"/>
-      <point x="1844" y="1045"/>
-      <point x="1963" y="879"/>
-      <point x="2146" y="879" type="curve" smooth="yes"/>
-      <point x="2435" y="879"/>
-      <point x="2706" y="1179"/>
-      <point x="2706" y="1550" type="curve" smooth="yes"/>
-      <point x="2706" y="1605"/>
-      <point x="2668" y="1698"/>
-      <point x="2566" y="1698" type="curve" smooth="yes"/>
-      <point x="2323" y="1698"/>
-      <point x="2119" y="1384"/>
-      <point x="1983" y="1193" type="curve"/>
-      <point x="1983" y="1193"/>
-      <point x="2042" y="1179"/>
-      <point x="2050" y="1172" type="curve"/>
-      <point x="2194" y="1378"/>
-      <point x="2344" y="1517"/>
-      <point x="2479" y="1517" type="curve" smooth="yes"/>
-      <point x="2596" y="1517"/>
-      <point x="2637" y="1429"/>
-      <point x="2627" y="1399" type="curve" smooth="yes"/>
-      <point x="2618" y="1373"/>
-      <point x="2468" y="1179"/>
-      <point x="2141" y="1179" type="curve" smooth="yes"/>
-      <point x="2002" y="1179"/>
-      <point x="1901" y="1249"/>
-      <point x="1858" y="1248" type="curve" smooth="yes"/>
-      <point x="1769" y="1246"/>
-      <point x="1733" y="1114"/>
-      <point x="1552" y="933" type="curve" smooth="yes"/>
-      <point x="1520" y="901"/>
-      <point x="1498" y="649"/>
-      <point x="1552" y="692" type="curve" smooth="yes"/>
-      <point x="1620" y="746"/>
-      <point x="1807" y="1045"/>
-    </contour>
-    <contour>
-      <point x="3207" y="1835" type="curve" smooth="yes"/>
-      <point x="3031" y="1835"/>
-      <point x="2709" y="957"/>
-      <point x="2179" y="957" type="curve" smooth="yes"/>
-      <point x="2142" y="957"/>
-      <point x="2101" y="886"/>
-      <point x="2150" y="886" type="curve" smooth="yes"/>
-      <point x="2718" y="886"/>
-      <point x="3076" y="1646"/>
-      <point x="3174" y="1646" type="curve" smooth="yes"/>
-      <point x="3198" y="1646"/>
-      <point x="3260" y="1534"/>
-      <point x="3315" y="1534" type="curve" smooth="yes"/>
-      <point x="3406" y="1534"/>
-      <point x="3483" y="1659"/>
-      <point x="3483" y="1746" type="curve" smooth="yes"/>
-      <point x="3483" y="1792"/>
-      <point x="3467" y="1828"/>
-      <point x="3437" y="1828" type="curve" smooth="yes"/>
-      <point x="3397" y="1828"/>
-      <point x="3375" y="1706"/>
-      <point x="3340" y="1706" type="curve" smooth="yes"/>
-      <point x="3306" y="1706"/>
-      <point x="3251" y="1835"/>
-    </contour>
-    <contour>
-      <point x="1373" y="1692" type="curve" smooth="yes"/>
-      <point x="1373" y="1706"/>
-      <point x="1333" y="1719"/>
-      <point x="1268" y="1783" type="curve" smooth="yes"/>
-      <point x="1203" y="1849"/>
-      <point x="1190" y="1889"/>
-      <point x="1176" y="1889" type="curve" smooth="yes"/>
-      <point x="1142" y="1889"/>
-      <point x="991" y="1728"/>
-      <point x="991" y="1692" type="curve" smooth="yes"/>
-      <point x="991" y="1650"/>
-      <point x="1145" y="1495"/>
-      <point x="1188" y="1495" type="curve" smooth="yes"/>
-      <point x="1221" y="1495"/>
-      <point x="1374" y="1657"/>
-    </contour>
-    <contour>
-      <point x="1680" y="1727" type="curve" smooth="yes"/>
-      <point x="1680" y="1741"/>
-      <point x="1640" y="1753"/>
-      <point x="1576" y="1818" type="curve" smooth="yes"/>
-      <point x="1510" y="1883"/>
-      <point x="1497" y="1924"/>
-      <point x="1484" y="1924" type="curve" smooth="yes"/>
-      <point x="1449" y="1924"/>
-      <point x="1298" y="1763"/>
-      <point x="1298" y="1727" type="curve" smooth="yes"/>
-      <point x="1298" y="1684"/>
-      <point x="1453" y="1529"/>
-      <point x="1495" y="1529" type="curve" smooth="yes"/>
-      <point x="1528" y="1529"/>
-      <point x="1681" y="1691"/>
-    </contour>
-    <contour>
-      <point x="3258" y="1270" type="curve" smooth="yes"/>
-      <point x="3067" y="931"/>
-      <point x="3130" y="763"/>
-      <point x="3260" y="763" type="curve" smooth="yes"/>
-      <point x="3396" y="763"/>
-      <point x="3394" y="990"/>
-      <point x="3339" y="990" type="curve" smooth="yes"/>
-      <point x="3300" y="990"/>
-      <point x="3299" y="926"/>
-      <point x="3267" y="926" type="curve" smooth="yes"/>
-      <point x="3208" y="926"/>
-      <point x="3202" y="1023"/>
-      <point x="3297" y="1257" type="curve" smooth="yes"/>
-      <point x="3301" y="1266"/>
-      <point x="3264" y="1281"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
deleted file mode 100644
index e9c728e76..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.draft.glif
+++ /dev/null
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw.draft" format="2">
-  <anchor x="721" y="513" name="_exit_qafWaw"/>
-  <anchor x="1108" y="1493" name="exit_lamKaf"/>
-  <anchor x="1328" y="1223" name="exit_meemAlt"/>
-  <anchor x="721" y="513" name="exit_qafWaw"/>
-  <outline>
-    <contour>
-      <point x="2458" y="906" type="curve"/>
-      <point x="2458" y="917"/>
-      <point x="2424" y="928"/>
-      <point x="2369" y="983" type="curve" smooth="yes"/>
-      <point x="2313" y="1039"/>
-      <point x="2303" y="1072"/>
-      <point x="2291" y="1073" type="curve"/>
-      <point x="2261" y="1073"/>
-      <point x="2134" y="936"/>
-      <point x="2134" y="906" type="curve" smooth="yes"/>
-      <point x="2134" y="870"/>
-      <point x="2265" y="738"/>
-      <point x="2300" y="738" type="curve" smooth="yes"/>
-      <point x="2329" y="738"/>
-      <point x="2459" y="875"/>
-    </contour>
-    <contour>
-      <point x="2758" y="927" type="curve"/>
-      <point x="2758" y="939"/>
-      <point x="2724" y="949"/>
-      <point x="2669" y="1005" type="curve" smooth="yes"/>
-      <point x="2613" y="1060"/>
-      <point x="2603" y="1093"/>
-      <point x="2591" y="1095" type="curve"/>
-      <point x="2561" y="1095"/>
-      <point x="2434" y="958"/>
-      <point x="2434" y="927" type="curve" smooth="yes"/>
-      <point x="2434" y="891"/>
-      <point x="2565" y="759"/>
-      <point x="2600" y="759" type="curve" smooth="yes"/>
-      <point x="2629" y="759"/>
-      <point x="2759" y="897"/>
-    </contour>
-    <contour>
-      <point x="2448" y="1216" type="curve" smooth="yes"/>
-      <point x="2448" y="1228"/>
-      <point x="2414" y="1239"/>
-      <point x="2359" y="1294" type="curve" smooth="yes"/>
-      <point x="2304" y="1350"/>
-      <point x="2293" y="1383"/>
-      <point x="2281" y="1384" type="curve"/>
-      <point x="2252" y="1384"/>
-      <point x="2124" y="1247"/>
-      <point x="2124" y="1216" type="curve" smooth="yes"/>
-      <point x="2124" y="1181"/>
-      <point x="2255" y="1049"/>
-      <point x="2291" y="1049" type="curve" smooth="yes"/>
-      <point x="2319" y="1049"/>
-      <point x="2449" y="1187"/>
-    </contour>
-    <contour>
-      <point x="2748" y="1238" type="curve" smooth="yes"/>
-      <point x="2748" y="1249"/>
-      <point x="2714" y="1260"/>
-      <point x="2659" y="1315" type="curve" smooth="yes"/>
-      <point x="2604" y="1371"/>
-      <point x="2593" y="1404"/>
-      <point x="2581" y="1405" type="curve"/>
-      <point x="2552" y="1405"/>
-      <point x="2424" y="1268"/>
-      <point x="2424" y="1238" type="curve" smooth="yes"/>
-      <point x="2424" y="1202"/>
-      <point x="2555" y="1070"/>
-      <point x="2591" y="1070" type="curve" smooth="yes"/>
-      <point x="2619" y="1070"/>
-      <point x="2749" y="1208"/>
-    </contour>
-    <contour>
-      <point x="718" y="501" type="curve" smooth="yes"/>
-      <point x="924" y="707"/>
-      <point x="1008" y="886"/>
-      <point x="1046" y="1093" type="curve"/>
-      <point x="1062" y="1052"/>
-      <point x="1200" y="1118"/>
-      <point x="1176" y="1154" type="curve" smooth="yes"/>
-      <point x="1152" y="1190"/>
-      <point x="1112" y="1254"/>
-      <point x="1112" y="1355" type="curve" smooth="yes"/>
-      <point x="1112" y="1399"/>
-      <point x="1112" y="1445"/>
-      <point x="1112" y="1492" type="curve" smooth="yes"/>
-      <point x="1112" y="1648"/>
-      <point x="1112" y="1774"/>
-      <point x="1121" y="1999" type="curve" smooth="yes"/>
-      <point x="1127" y="2151"/>
-      <point x="1151" y="2196"/>
-      <point x="1159" y="2225" type="curve" smooth="yes"/>
-      <point x="1164" y="2243"/>
-      <point x="1146" y="2292"/>
-      <point x="1126" y="2270" type="curve" smooth="yes"/>
-      <point x="1086" y="2226"/>
-      <point x="988" y="2067"/>
-      <point x="978" y="1901" type="curve" smooth="yes"/>
-      <point x="960" y="1590"/>
-      <point x="972" y="1421"/>
-      <point x="970" y="1197" type="curve" smooth="yes"/>
-      <point x="968" y="1012"/>
-      <point x="882" y="851"/>
-      <point x="718" y="722" type="curve" smooth="yes"/>
-      <point x="655" y="672"/>
-      <point x="673" y="456"/>
-    </contour>
-    <contour>
-      <point x="128" y="-9" type="curve" smooth="yes"/>
-      <point x="223" y="-5"/>
-      <point x="511" y="34"/>
-      <point x="541" y="64" type="curve" smooth="yes"/>
-      <point x="589" y="112"/>
-      <point x="752" y="347"/>
-      <point x="752" y="576" type="curve" smooth="yes"/>
-      <point x="752" y="756"/>
-      <point x="687" y="992"/>
-      <point x="539" y="992" type="curve" smooth="yes"/>
-      <point x="485" y="992"/>
-      <point x="421" y="981"/>
-      <point x="363" y="765" type="curve" smooth="yes"/>
-      <point x="274" y="433"/>
-      <point x="396" y="375"/>
-      <point x="631" y="458" type="curve" smooth="yes"/>
-      <point x="648" y="464"/>
-      <point x="655" y="450"/>
-      <point x="655" y="431" type="curve" smooth="yes"/>
-      <point x="655" y="295"/>
-      <point x="264" y="103"/>
-      <point x="110" y="40" type="curve" smooth="yes"/>
-      <point x="88" y="31"/>
-      <point x="106" y="-10"/>
-    </contour>
-    <contour>
-      <point x="1313" y="759" type="curve" smooth="yes"/>
-      <point x="1509" y="759"/>
-      <point x="1627" y="931"/>
-      <point x="1627" y="1112" type="curve" smooth="yes"/>
-      <point x="1627" y="1174"/>
-      <point x="1601" y="1199"/>
-      <point x="1563" y="1199" type="curve" smooth="yes"/>
-      <point x="1498" y="1199"/>
-      <point x="1425" y="1172"/>
-      <point x="1415" y="1254" type="curve" smooth="yes"/>
-      <point x="1414" y="1268"/>
-      <point x="1342" y="1271"/>
-      <point x="1340" y="1253" type="curve" smooth="yes"/>
-      <point x="1337" y="1231"/>
-      <point x="1330" y="1152"/>
-      <point x="1370" y="1092" type="curve"/>
-      <point x="1202" y="1092"/>
-      <point x="1128" y="1214"/>
-      <point x="1112" y="1492" type="curve" smooth="yes"/>
-      <point x="1107" y="1575"/>
-      <point x="1015" y="1361"/>
-      <point x="1021" y="1282" type="curve" smooth="yes"/>
-      <point x="1045" y="967"/>
-      <point x="1164" y="759"/>
-    </contour>
-    <contour>
-      <point x="1340" y="1253" type="curve" smooth="yes"/>
-      <point x="1337" y="1231"/>
-      <point x="1416" y="1238"/>
-      <point x="1415" y="1254" type="curve" smooth="yes"/>
-      <point x="1405" y="1379"/>
-      <point x="1745" y="1471"/>
-      <point x="1941" y="1571" type="curve" smooth="yes"/>
-      <point x="2121" y="1663"/>
-      <point x="2237" y="1821"/>
-      <point x="2237" y="1967" type="curve" smooth="yes"/>
-      <point x="2237" y="2023"/>
-      <point x="2034" y="2036"/>
-      <point x="1913" y="2036" type="curve" smooth="yes"/>
-      <point x="1738" y="2036"/>
-      <point x="1601" y="1955"/>
-      <point x="1500" y="1732" type="curve" smooth="yes"/>
-      <point x="1490" y="1710"/>
-      <point x="1530" y="1683"/>
-      <point x="1542" y="1704" type="curve" smooth="yes"/>
-      <point x="1628" y="1855"/>
-      <point x="1711" y="1854"/>
-      <point x="1873" y="1854" type="curve" smooth="yes"/>
-      <point x="1964" y="1854"/>
-      <point x="2121" y="1844"/>
-      <point x="2121" y="1806" type="curve" smooth="yes"/>
-      <point x="2121" y="1750"/>
-      <point x="1776" y="1639"/>
-      <point x="1627" y="1562" type="curve" smooth="yes"/>
-      <point x="1526" y="1510"/>
-      <point x="1363" y="1429"/>
-    </contour>
-    <contour>
-      <point x="2416" y="847" type="curve"/>
-      <point x="2416" y="860"/>
-      <point x="2376" y="873"/>
-      <point x="2312" y="937" type="curve" smooth="yes"/>
-      <point x="2246" y="1003"/>
-      <point x="2234" y="1042"/>
-      <point x="2220" y="1043" type="curve"/>
-      <point x="2185" y="1043"/>
-      <point x="2035" y="882"/>
-      <point x="2035" y="847" type="curve" smooth="yes"/>
-      <point x="2035" y="804"/>
-      <point x="2189" y="649"/>
-      <point x="2231" y="649" type="curve" smooth="yes"/>
-      <point x="2265" y="649"/>
-      <point x="2418" y="811"/>
-    </contour>
-    <contour>
-      <point x="2769" y="872" type="curve"/>
-      <point x="2769" y="886"/>
-      <point x="2729" y="898"/>
-      <point x="2665" y="963" type="curve" smooth="yes"/>
-      <point x="2599" y="1028"/>
-      <point x="2587" y="1067"/>
-      <point x="2573" y="1069" type="curve"/>
-      <point x="2538" y="1069"/>
-      <point x="2388" y="908"/>
-      <point x="2388" y="872" type="curve" smooth="yes"/>
-      <point x="2388" y="829"/>
-      <point x="2542" y="674"/>
-      <point x="2584" y="674" type="curve" smooth="yes"/>
-      <point x="2618" y="674"/>
-      <point x="2771" y="836"/>
-    </contour>
-    <contour>
-      <point x="2405" y="1212" type="curve" smooth="yes"/>
-      <point x="2405" y="1226"/>
-      <point x="2365" y="1239"/>
-      <point x="2300" y="1303" type="curve" smooth="yes"/>
-      <point x="2235" y="1369"/>
-      <point x="2222" y="1408"/>
-      <point x="2208" y="1409" type="curve"/>
-      <point x="2174" y="1409"/>
-      <point x="2023" y="1248"/>
-      <point x="2023" y="1212" type="curve" smooth="yes"/>
-      <point x="2023" y="1170"/>
-      <point x="2177" y="1015"/>
-      <point x="2220" y="1015" type="curve" smooth="yes"/>
-      <point x="2253" y="1015"/>
-      <point x="2406" y="1177"/>
-    </contour>
-    <contour>
-      <point x="2758" y="1238" type="curve" smooth="yes"/>
-      <point x="2758" y="1251"/>
-      <point x="2718" y="1264"/>
-      <point x="2653" y="1328" type="curve" smooth="yes"/>
-      <point x="2588" y="1394"/>
-      <point x="2575" y="1433"/>
-      <point x="2561" y="1434" type="curve"/>
-      <point x="2527" y="1434"/>
-      <point x="2376" y="1273"/>
-      <point x="2376" y="1238" type="curve" smooth="yes"/>
-      <point x="2376" y="1195"/>
-      <point x="2530" y="1040"/>
-      <point x="2573" y="1040" type="curve" smooth="yes"/>
-      <point x="2606" y="1040"/>
-      <point x="2759" y="1202"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
deleted file mode 100644
index 2576b7126..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testJ_eemM_eemaltL_amW_aw.glif
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw" format="2">
-  <outline>
-    <contour>
-      <point x="2458" y="906" type="curve"/>
-      <point x="2458" y="917"/>
-      <point x="2424" y="928"/>
-      <point x="2369" y="983" type="curve" smooth="yes"/>
-      <point x="2313" y="1039"/>
-      <point x="2303" y="1072"/>
-      <point x="2291" y="1073" type="curve"/>
-      <point x="2261" y="1073"/>
-      <point x="2134" y="936"/>
-      <point x="2134" y="906" type="curve" smooth="yes"/>
-      <point x="2134" y="870"/>
-      <point x="2265" y="738"/>
-      <point x="2300" y="738" type="curve" smooth="yes"/>
-      <point x="2329" y="738"/>
-      <point x="2459" y="875"/>
-    </contour>
-    <contour>
-      <point x="2758" y="927" type="curve"/>
-      <point x="2758" y="939"/>
-      <point x="2724" y="949"/>
-      <point x="2669" y="1005" type="curve" smooth="yes"/>
-      <point x="2613" y="1060"/>
-      <point x="2603" y="1093"/>
-      <point x="2591" y="1095" type="curve"/>
-      <point x="2561" y="1095"/>
-      <point x="2434" y="958"/>
-      <point x="2434" y="927" type="curve" smooth="yes"/>
-      <point x="2434" y="891"/>
-      <point x="2565" y="759"/>
-      <point x="2600" y="759" type="curve" smooth="yes"/>
-      <point x="2629" y="759"/>
-      <point x="2759" y="897"/>
-    </contour>
-    <contour>
-      <point x="2448" y="1216" type="curve" smooth="yes"/>
-      <point x="2448" y="1228"/>
-      <point x="2414" y="1239"/>
-      <point x="2359" y="1294" type="curve" smooth="yes"/>
-      <point x="2304" y="1350"/>
-      <point x="2293" y="1383"/>
-      <point x="2281" y="1384" type="curve"/>
-      <point x="2252" y="1384"/>
-      <point x="2124" y="1247"/>
-      <point x="2124" y="1216" type="curve" smooth="yes"/>
-      <point x="2124" y="1181"/>
-      <point x="2255" y="1049"/>
-      <point x="2291" y="1049" type="curve" smooth="yes"/>
-      <point x="2319" y="1049"/>
-      <point x="2449" y="1187"/>
-    </contour>
-    <contour>
-      <point x="2748" y="1238" type="curve" smooth="yes"/>
-      <point x="2748" y="1249"/>
-      <point x="2714" y="1260"/>
-      <point x="2659" y="1315" type="curve" smooth="yes"/>
-      <point x="2604" y="1371"/>
-      <point x="2593" y="1404"/>
-      <point x="2581" y="1405" type="curve"/>
-      <point x="2552" y="1405"/>
-      <point x="2424" y="1268"/>
-      <point x="2424" y="1238" type="curve" smooth="yes"/>
-      <point x="2424" y="1202"/>
-      <point x="2555" y="1070"/>
-      <point x="2591" y="1070" type="curve" smooth="yes"/>
-      <point x="2619" y="1070"/>
-      <point x="2749" y="1208"/>
-    </contour>
-    <contour>
-      <point x="2416" y="847" type="curve"/>
-      <point x="2416" y="860"/>
-      <point x="2376" y="873"/>
-      <point x="2312" y="937" type="curve" smooth="yes"/>
-      <point x="2246" y="1003"/>
-      <point x="2234" y="1042"/>
-      <point x="2220" y="1043" type="curve"/>
-      <point x="2185" y="1043"/>
-      <point x="2035" y="882"/>
-      <point x="2035" y="847" type="curve" smooth="yes"/>
-      <point x="2035" y="804"/>
-      <point x="2189" y="649"/>
-      <point x="2231" y="649" type="curve" smooth="yes"/>
-      <point x="2265" y="649"/>
-      <point x="2418" y="811"/>
-    </contour>
-    <contour>
-      <point x="2769" y="872" type="curve"/>
-      <point x="2769" y="886"/>
-      <point x="2729" y="898"/>
-      <point x="2665" y="963" type="curve" smooth="yes"/>
-      <point x="2599" y="1028"/>
-      <point x="2587" y="1067"/>
-      <point x="2573" y="1069" type="curve"/>
-      <point x="2538" y="1069"/>
-      <point x="2388" y="908"/>
-      <point x="2388" y="872" type="curve" smooth="yes"/>
-      <point x="2388" y="829"/>
-      <point x="2542" y="674"/>
-      <point x="2584" y="674" type="curve" smooth="yes"/>
-      <point x="2618" y="674"/>
-      <point x="2771" y="836"/>
-    </contour>
-    <contour>
-      <point x="2405" y="1212" type="curve" smooth="yes"/>
-      <point x="2405" y="1226"/>
-      <point x="2365" y="1239"/>
-      <point x="2300" y="1303" type="curve" smooth="yes"/>
-      <point x="2235" y="1369"/>
-      <point x="2222" y="1408"/>
-      <point x="2208" y="1409" type="curve"/>
-      <point x="2174" y="1409"/>
-      <point x="2023" y="1248"/>
-      <point x="2023" y="1212" type="curve" smooth="yes"/>
-      <point x="2023" y="1170"/>
-      <point x="2177" y="1015"/>
-      <point x="2220" y="1015" type="curve" smooth="yes"/>
-      <point x="2253" y="1015"/>
-      <point x="2406" y="1177"/>
-    </contour>
-    <contour>
-      <point x="2758" y="1238" type="curve" smooth="yes"/>
-      <point x="2758" y="1251"/>
-      <point x="2718" y="1264"/>
-      <point x="2653" y="1328" type="curve" smooth="yes"/>
-      <point x="2588" y="1394"/>
-      <point x="2575" y="1433"/>
-      <point x="2561" y="1434" type="curve"/>
-      <point x="2527" y="1434"/>
-      <point x="2376" y="1273"/>
-      <point x="2376" y="1238" type="curve" smooth="yes"/>
-      <point x="2376" y="1195"/>
-      <point x="2530" y="1040"/>
-      <point x="2573" y="1040" type="curve" smooth="yes"/>
-      <point x="2606" y="1040"/>
-      <point x="2759" y="1202"/>
-    </contour>
-    <contour>
-      <point x="543" y="992" type="curve" smooth="yes"/>
-      <point x="489" y="992"/>
-      <point x="425" y="981"/>
-      <point x="367" y="765" type="curve" smooth="yes"/>
-      <point x="278" y="433"/>
-      <point x="400" y="375"/>
-      <point x="635" y="458" type="curve" smooth="yes"/>
-      <point x="652" y="464"/>
-      <point x="659" y="450"/>
-      <point x="659" y="431" type="curve" smooth="yes"/>
-      <point x="659" y="295"/>
-      <point x="268" y="103"/>
-      <point x="114" y="40" type="curve" smooth="yes"/>
-      <point x="92" y="31"/>
-      <point x="110" y="-10"/>
-      <point x="132" y="-9" type="curve" smooth="yes"/>
-      <point x="227" y="-5"/>
-      <point x="515" y="34"/>
-      <point x="545" y="64" type="curve" smooth="yes"/>
-      <point x="593" y="112"/>
-      <point x="756" y="347"/>
-      <point x="756" y="576" type="curve" smooth="yes"/>
-      <point x="756" y="756"/>
-      <point x="691" y="992"/>
-    </contour>
-    <contour>
-      <point x="1123" y="1997" type="curve" smooth="yes"/>
-      <point x="1129" y="2149"/>
-      <point x="1153" y="2194"/>
-      <point x="1161" y="2223" type="curve" smooth="yes"/>
-      <point x="1166" y="2241"/>
-      <point x="1148" y="2290"/>
-      <point x="1128" y="2268" type="curve" smooth="yes"/>
-      <point x="1088" y="2224"/>
-      <point x="990" y="2065"/>
-      <point x="980" y="1899" type="curve" smooth="yes"/>
-      <point x="962" y="1588"/>
-      <point x="974" y="1419"/>
-      <point x="972" y="1195" type="curve" smooth="yes"/>
-      <point x="970" y="1010"/>
-      <point x="884" y="843"/>
-      <point x="720" y="714" type="curve" smooth="yes"/>
-      <point x="657" y="664"/>
-      <point x="675" y="454"/>
-      <point x="720" y="499" type="curve" smooth="yes"/>
-      <point x="926" y="705"/>
-      <point x="1010" y="884"/>
-      <point x="1048" y="1091" type="curve"/>
-      <point x="1064" y="1050"/>
-      <point x="1202" y="1116"/>
-      <point x="1178" y="1152" type="curve" smooth="yes"/>
-      <point x="1154" y="1188"/>
-      <point x="1114" y="1252"/>
-      <point x="1114" y="1353" type="curve" smooth="yes"/>
-      <point x="1114" y="1397"/>
-      <point x="1114" y="1443"/>
-      <point x="1114" y="1490" type="curve" smooth="yes"/>
-      <point x="1114" y="1646"/>
-      <point x="1114" y="1772"/>
-    </contour>
-    <contour>
-      <point x="1315" y="729" type="curve" smooth="yes"/>
-      <point x="1511" y="729"/>
-      <point x="1629" y="905"/>
-      <point x="1629" y="1086" type="curve" smooth="yes"/>
-      <point x="1629" y="1148"/>
-      <point x="1603" y="1173"/>
-      <point x="1565" y="1173" type="curve" smooth="yes"/>
-      <point x="1500" y="1173"/>
-      <point x="1427" y="1146"/>
-      <point x="1417" y="1228" type="curve"/>
-      <point x="1416" y="1242"/>
-      <point x="1344" y="1245"/>
-      <point x="1342" y="1227" type="curve" smooth="yes"/>
-      <point x="1339" y="1205"/>
-      <point x="1332" y="1126"/>
-      <point x="1372" y="1066" type="curve"/>
-      <point x="1204" y="1066"/>
-      <point x="1130" y="1188"/>
-      <point x="1114" y="1466" type="curve" smooth="yes"/>
-      <point x="1109" y="1549"/>
-      <point x="1017" y="1335"/>
-      <point x="1023" y="1256" type="curve" smooth="yes"/>
-      <point x="1047" y="941"/>
-      <point x="1166" y="729"/>
-    </contour>
-    <contour>
-      <point x="2247" y="2012" type="curve" smooth="yes"/>
-      <point x="2250" y="2067"/>
-      <point x="2045" y="2081"/>
-      <point x="1924" y="2081" type="curve" smooth="yes"/>
-      <point x="1749" y="2081"/>
-      <point x="1612" y="1920"/>
-      <point x="1511" y="1697" type="curve" smooth="yes"/>
-      <point x="1501" y="1675"/>
-      <point x="1541" y="1649"/>
-      <point x="1553" y="1669" type="curve" smooth="yes"/>
-      <point x="1642" y="1818"/>
-      <point x="1731" y="1819"/>
-      <point x="1884" y="1819" type="curve" smooth="yes"/>
-      <point x="1983" y="1819"/>
-      <point x="2122" y="1809"/>
-      <point x="2122" y="1771" type="curve" smooth="yes"/>
-      <point x="2122" y="1715"/>
-      <point x="1777" y="1604"/>
-      <point x="1628" y="1527" type="curve" smooth="yes"/>
-      <point x="1527" y="1475"/>
-      <point x="1364" y="1394"/>
-      <point x="1341" y="1218" type="curve" smooth="yes"/>
-      <point x="1338" y="1196"/>
-      <point x="1417" y="1203"/>
-      <point x="1416" y="1219" type="curve" smooth="yes"/>
-      <point x="1406" y="1344"/>
-      <point x="1746" y="1436"/>
-      <point x="1942" y="1536" type="curve" smooth="yes"/>
-      <point x="2122" y="1628"/>
-      <point x="2238" y="1746"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
deleted file mode 100644
index d2a708583..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testK_afS_eenH_ehdo.draft.glif
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testKafSeenHehdo.draft" format="2">
-  <anchor x="929" y="727" name="_exit_hehdoach"/>
-  <anchor x="929" y="727" name="exit_hehdoachxxx"/>
-  <outline>
-    <contour>
-      <point x="2442" y="2130" type="curve" smooth="yes"/>
-      <point x="2449" y="2343"/>
-      <point x="2515" y="2410"/>
-      <point x="2848" y="2649" type="curve" smooth="yes"/>
-      <point x="3254" y="2940"/>
-      <point x="3375" y="3032"/>
-      <point x="3390" y="3276" type="curve" smooth="yes"/>
-      <point x="3391" y="3294"/>
-      <point x="3363" y="3316"/>
-      <point x="3354" y="3301" type="curve" smooth="yes"/>
-      <point x="3269" y="3163"/>
-      <point x="3233" y="3110"/>
-      <point x="2855" y="2839" type="curve" smooth="yes"/>
-      <point x="2576" y="2639"/>
-      <point x="2284" y="2271"/>
-      <point x="2284" y="1793" type="curve" smooth="yes"/>
-      <point x="2284" y="1542"/>
-      <point x="2238" y="1430"/>
-      <point x="2130" y="1349" type="curve" smooth="yes"/>
-      <point x="2112" y="1335"/>
-      <point x="2095" y="1176"/>
-      <point x="2130" y="1198" type="curve" smooth="yes"/>
-      <point x="2198" y="1241"/>
-      <point x="2248" y="1332"/>
-      <point x="2295" y="1444" type="curve" smooth="yes"/>
-      <point x="2403" y="1701"/>
-      <point x="2435" y="1898"/>
-    </contour>
-    <contour>
-      <point x="734" y="928" type="curve" smooth="yes"/>
-      <point x="418" y="928"/>
-      <point x="396" y="267"/>
-      <point x="257" y="170" type="curve" smooth="yes"/>
-      <point x="217" y="143"/>
-      <point x="397" y="227"/>
-      <point x="418" y="274" type="curve" smooth="yes"/>
-      <point x="481" y="419"/>
-      <point x="522" y="760"/>
-      <point x="647" y="760" type="curve" smooth="yes"/>
-      <point x="768" y="760"/>
-      <point x="803" y="622"/>
-      <point x="748" y="565" type="curve" smooth="yes"/>
-      <point x="720" y="535"/>
-      <point x="909" y="638"/>
-      <point x="921" y="661" type="curve" smooth="yes"/>
-      <point x="957" y="735"/>
-      <point x="899" y="928"/>
-    </contour>
-    <contour>
-      <point x="1109" y="817" type="curve" smooth="yes"/>
-      <point x="847" y="817"/>
-      <point x="635" y="264"/>
-      <point x="106" y="129" type="curve" smooth="yes"/>
-      <point x="86" y="123"/>
-      <point x="124" y="72"/>
-      <point x="137" y="75" type="curve" smooth="yes"/>
-      <point x="704" y="218"/>
-      <point x="860" y="653"/>
-      <point x="1018" y="653" type="curve" smooth="yes"/>
-      <point x="1080" y="653"/>
-      <point x="1126" y="609"/>
-      <point x="1126" y="560" type="curve" smooth="yes"/>
-      <point x="1126" y="462"/>
-      <point x="945" y="346"/>
-      <point x="581" y="293" type="curve" smooth="yes"/>
-      <point x="545" y="288"/>
-      <point x="332" y="189"/>
-      <point x="365" y="192" type="curve" smooth="yes"/>
-      <point x="831" y="246"/>
-      <point x="1269" y="299"/>
-      <point x="1269" y="646" type="curve" smooth="yes"/>
-      <point x="1269" y="740"/>
-      <point x="1225" y="817"/>
-    </contour>
-    <contour>
-      <point x="1378" y="903" type="curve" smooth="yes"/>
-      <point x="1508" y="903"/>
-      <point x="1563" y="1049"/>
-      <point x="1597" y="1049" type="curve" smooth="yes"/>
-      <point x="1619" y="1049"/>
-      <point x="1626" y="1028"/>
-      <point x="1689" y="1028" type="curve" smooth="yes"/>
-      <point x="1832" y="1028"/>
-      <point x="1899" y="1207"/>
-      <point x="1933" y="1207" type="curve" smooth="yes"/>
-      <point x="1954" y="1207"/>
-      <point x="1998" y="1176"/>
-      <point x="2046" y="1176" type="curve" smooth="yes"/>
-      <point x="2080" y="1176"/>
-      <point x="2095" y="1176"/>
-      <point x="2130" y="1198" type="curve" smooth="yes"/>
-      <point x="2170" y="1223"/>
-      <point x="2170" y="1379"/>
-      <point x="2130" y="1349" type="curve" smooth="yes"/>
-      <point x="2109" y="1334"/>
-      <point x="2086" y="1332"/>
-      <point x="2069" y="1332" type="curve" smooth="yes"/>
-      <point x="1992" y="1332"/>
-      <point x="1977" y="1419"/>
-      <point x="1948" y="1419" type="curve" smooth="yes"/>
-      <point x="1888" y="1419"/>
-      <point x="1847" y="1192"/>
-      <point x="1730" y="1189" type="curve" smooth="yes"/>
-      <point x="1649" y="1188"/>
-      <point x="1639" y="1262"/>
-      <point x="1610" y="1262" type="curve" smooth="yes"/>
-      <point x="1550" y="1262"/>
-      <point x="1516" y="1065"/>
-      <point x="1391" y="1065" type="curve" smooth="yes"/>
-      <point x="1354" y="1065"/>
-      <point x="1336" y="1084"/>
-      <point x="1280" y="1084" type="curve" smooth="yes"/>
-      <point x="1102" y="1084"/>
-      <point x="958" y="866"/>
-      <point x="900" y="741" type="curve" smooth="yes"/>
-      <point x="898" y="736"/>
-      <point x="948" y="689"/>
-      <point x="956" y="699" type="curve" smooth="yes"/>
-      <point x="1097" y="887"/>
-      <point x="1171" y="924"/>
-      <point x="1257" y="924" type="curve" smooth="yes"/>
-      <point x="1294" y="924"/>
-      <point x="1341" y="903"/>
-    </contour>
-    <contour>
-      <point x="1578" y="1799" type="curve" smooth="yes"/>
-      <point x="1578" y="1812"/>
-      <point x="1537" y="1825"/>
-      <point x="1473" y="1889" type="curve" smooth="yes"/>
-      <point x="1407" y="1955"/>
-      <point x="1395" y="1995"/>
-      <point x="1381" y="1995" type="curve" smooth="yes"/>
-      <point x="1346" y="1995"/>
-      <point x="1196" y="1834"/>
-      <point x="1196" y="1799" type="curve" smooth="yes"/>
-      <point x="1196" y="1756"/>
-      <point x="1350" y="1601"/>
-      <point x="1392" y="1601" type="curve" smooth="yes"/>
-      <point x="1426" y="1601"/>
-      <point x="1579" y="1763"/>
-    </contour>
-    <contour>
-      <point x="1931" y="1824" type="curve" smooth="yes"/>
-      <point x="1931" y="1838"/>
-      <point x="1890" y="1850"/>
-      <point x="1826" y="1915" type="curve" smooth="yes"/>
-      <point x="1760" y="1980"/>
-      <point x="1748" y="2021"/>
-      <point x="1734" y="2021" type="curve" smooth="yes"/>
-      <point x="1699" y="2021"/>
-      <point x="1549" y="1860"/>
-      <point x="1549" y="1824" type="curve" smooth="yes"/>
-      <point x="1549" y="1781"/>
-      <point x="1703" y="1626"/>
-      <point x="1745" y="1626" type="curve" smooth="yes"/>
-      <point x="1779" y="1626"/>
-      <point x="1932" y="1788"/>
-    </contour>
-    <contour>
-      <point x="1732" y="2157" type="curve" smooth="yes"/>
-      <point x="1732" y="2171"/>
-      <point x="1691" y="2184"/>
-      <point x="1627" y="2248" type="curve" smooth="yes"/>
-      <point x="1561" y="2314"/>
-      <point x="1549" y="2354"/>
-      <point x="1535" y="2354" type="curve" smooth="yes"/>
-      <point x="1501" y="2354"/>
-      <point x="1350" y="2193"/>
-      <point x="1350" y="2157" type="curve" smooth="yes"/>
-      <point x="1350" y="2115"/>
-      <point x="1504" y="1960"/>
-      <point x="1547" y="1960" type="curve" smooth="yes"/>
-      <point x="1580" y="1960"/>
-      <point x="1733" y="2122"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testM_eemK_afR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
deleted file mode 100644
index 059240298..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testM_eemK_afR_eh.glif
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testMeemKafReh" format="2">
-  <outline>
-    <contour>
-      <point x="774" y="679" type="curve" smooth="yes"/>
-      <point x="760" y="626"/>
-      <point x="716" y="491"/>
-      <point x="645" y="414" type="curve" smooth="yes"/>
-      <point x="539" y="299"/>
-      <point x="381" y="220"/>
-      <point x="83" y="39" type="curve" smooth="yes"/>
-      <point x="64" y="28"/>
-      <point x="81" y="-10"/>
-      <point x="102" y="-8" type="curve" smooth="yes"/>
-      <point x="156" y="-1"/>
-      <point x="562" y="61"/>
-      <point x="634" y="137" type="curve" smooth="yes"/>
-      <point x="711" y="218"/>
-      <point x="815" y="542"/>
-      <point x="848" y="644" type="curve" smooth="yes"/>
-      <point x="859" y="678"/>
-      <point x="778" y="697"/>
-    </contour>
-    <contour>
-      <point x="1372" y="2059" type="curve" smooth="yes"/>
-      <point x="1383" y="2272"/>
-      <point x="1447" y="2339"/>
-      <point x="1780" y="2578" type="curve" smooth="yes"/>
-      <point x="2186" y="2869"/>
-      <point x="2307" y="2961"/>
-      <point x="2322" y="3205" type="curve" smooth="yes"/>
-      <point x="2323" y="3223"/>
-      <point x="2295" y="3245"/>
-      <point x="2286" y="3230" type="curve" smooth="yes"/>
-      <point x="2201" y="3092"/>
-      <point x="2165" y="3039"/>
-      <point x="1787" y="2768" type="curve" smooth="yes"/>
-      <point x="1508" y="2568"/>
-      <point x="1216" y="2220"/>
-      <point x="1216" y="1722" type="curve" smooth="yes"/>
-      <point x="1216" y="1276"/>
-      <point x="1209" y="1140"/>
-      <point x="1163" y="1072" type="curve" smooth="yes"/>
-      <point x="1083" y="953"/>
-      <point x="827" y="961"/>
-      <point x="769" y="662" type="curve" smooth="yes"/>
-      <point x="764" y="635"/>
-      <point x="828" y="577"/>
-      <point x="843" y="627" type="curve" smooth="yes"/>
-      <point x="909" y="848"/>
-      <point x="1113" y="797"/>
-      <point x="1228" y="1044" type="curve" smooth="yes"/>
-      <point x="1290" y="1177"/>
-      <point x="1362" y="1430"/>
-      <point x="1362" y="1692" type="curve" smooth="yes"/>
-      <point x="1362" y="1823"/>
-      <point x="1366" y="1947"/>
-    </contour>
-    <contour>
-      <point x="1366" y="1690" type="curve" smooth="yes"/>
-      <point x="1363" y="1772"/>
-      <point x="1264" y="1560"/>
-      <point x="1270" y="1480" type="curve" smooth="yes"/>
-      <point x="1295" y="1156"/>
-      <point x="1401" y="940"/>
-      <point x="1562" y="940" type="curve" smooth="yes"/>
-      <point x="1819" y="940"/>
-      <point x="2003" y="1457"/>
-      <point x="1731" y="1540" type="curve" smooth="yes"/>
-      <point x="1685" y="1554"/>
-      <point x="1589" y="1342"/>
-      <point x="1586" y="1283" type="curve"/>
-      <point x="1542" y="1236"/>
-      <point x="1378" y="1442"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
deleted file mode 100644
index a4e6c1fa4..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs.public.background/testS_adB_ehL_amN_oon.draft.glif
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testSadBehLamNoon.draft" format="2">
-  <outline>
-    <contour>
-      <point x="3057" y="1772" type="curve" smooth="yes"/>
-      <point x="3088" y="1772"/>
-      <point x="3221" y="1607"/>
-      <point x="3404" y="1607" type="curve" smooth="yes"/>
-      <point x="3728" y="1607"/>
-      <point x="3962" y="1959"/>
-      <point x="3962" y="2277" type="curve" smooth="yes"/>
-      <point x="3962" y="2332"/>
-      <point x="3931" y="2425"/>
-      <point x="3823" y="2425" type="curve" smooth="yes"/>
-      <point x="3579" y="2425"/>
-      <point x="3382" y="2110"/>
-      <point x="3233" y="1920" type="curve"/>
-      <point x="3233" y="1920"/>
-      <point x="3294" y="1899"/>
-      <point x="3306" y="1899" type="curve"/>
-      <point x="3432" y="2083"/>
-      <point x="3594" y="2244"/>
-      <point x="3728" y="2244" type="curve" smooth="yes"/>
-      <point x="3846" y="2244"/>
-      <point x="3893" y="2156"/>
-      <point x="3883" y="2126" type="curve" smooth="yes"/>
-      <point x="3874" y="2100"/>
-      <point x="3724" y="1907"/>
-      <point x="3395" y="1907" type="curve" smooth="yes"/>
-      <point x="3261" y="1907"/>
-      <point x="3166" y="1983"/>
-      <point x="3112" y="1983" type="curve" smooth="yes"/>
-      <point x="3044" y="1983"/>
-      <point x="2952" y="1767"/>
-      <point x="2885" y="1767" type="curve" smooth="yes"/>
-      <point x="2834" y="1767"/>
-      <point x="2795" y="1815"/>
-      <point x="2742" y="1815" type="curve" smooth="yes"/>
-      <point x="2692" y="1815"/>
-      <point x="2668" y="1788"/>
-      <point x="2575" y="1688" type="curve" smooth="yes"/>
-      <point x="2549" y="1660"/>
-      <point x="2557" y="1496"/>
-      <point x="2575" y="1523" type="curve" smooth="yes"/>
-      <point x="2611" y="1577"/>
-      <point x="2675" y="1627"/>
-      <point x="2707" y="1627" type="curve" smooth="yes"/>
-      <point x="2752" y="1627"/>
-      <point x="2819" y="1575"/>
-      <point x="2856" y="1575" type="curve" smooth="yes"/>
-      <point x="2934" y="1575"/>
-      <point x="3024" y="1772"/>
-    </contour>
-    <contour>
-      <point x="2575" y="1688" type="curve" smooth="yes"/>
-      <point x="2509" y="1615"/>
-      <point x="2421" y="1519"/>
-      <point x="2271" y="1521" type="curve" smooth="yes"/>
-      <point x="2099" y="1523"/>
-      <point x="2047" y="1711"/>
-      <point x="2038" y="1931" type="curve" smooth="yes"/>
-      <point x="2035" y="2001"/>
-      <point x="1939" y="1861"/>
-      <point x="1943" y="1771" type="curve" smooth="yes"/>
-      <point x="1960" y="1397"/>
-      <point x="2077" y="1181"/>
-      <point x="2221" y="1181" type="curve" smooth="yes"/>
-      <point x="2363" y="1181"/>
-      <point x="2492" y="1399"/>
-      <point x="2575" y="1523" type="curve" smooth="yes"/>
-      <point x="2591" y="1547"/>
-      <point x="2596" y="1711"/>
-    </contour>
-    <contour>
-      <point x="2047" y="2439" type="curve" smooth="yes"/>
-      <point x="2053" y="2591"/>
-      <point x="2077" y="2636"/>
-      <point x="2085" y="2665" type="curve" smooth="yes"/>
-      <point x="2090" y="2683"/>
-      <point x="2072" y="2732"/>
-      <point x="2052" y="2710" type="curve" smooth="yes"/>
-      <point x="2012" y="2666"/>
-      <point x="1914" y="2507"/>
-      <point x="1904" y="2341" type="curve" smooth="yes"/>
-      <point x="1886" y="2030"/>
-      <point x="1898" y="1861"/>
-      <point x="1896" y="1637" type="curve" smooth="yes"/>
-      <point x="1892" y="1197"/>
-      <point x="1602" y="1181"/>
-      <point x="1496" y="1243" type="curve" smooth="yes"/>
-      <point x="1490" y="1247"/>
-      <point x="1481" y="1004"/>
-      <point x="1495" y="1004" type="curve" smooth="yes"/>
-      <point x="1672" y="1004"/>
-      <point x="1886" y="1190"/>
-      <point x="1964" y="1510" type="curve"/>
-      <point x="1980" y="1468"/>
-      <point x="2128" y="1564"/>
-      <point x="2097" y="1599" type="curve" smooth="yes"/>
-      <point x="2066" y="1635"/>
-      <point x="2038" y="1694"/>
-      <point x="2038" y="1795" type="curve" smooth="yes"/>
-      <point x="2038" y="1839"/>
-      <point x="2038" y="1885"/>
-      <point x="2038" y="1932" type="curve" smooth="yes"/>
-      <point x="2038" y="2088"/>
-      <point x="2038" y="2214"/>
-    </contour>
-    <contour>
-      <point x="1569" y="1044" type="curve"/>
-      <point x="1577" y="1044"/>
-      <point x="1613" y="1200"/>
-      <point x="1576" y="1200" type="curve" smooth="yes"/>
-      <point x="1517" y="1200"/>
-      <point x="1508" y="1243"/>
-      <point x="1496" y="1243" type="curve" smooth="yes"/>
-      <point x="1466" y="1243"/>
-      <point x="1446" y="1120"/>
-      <point x="1446" y="1083" type="curve" smooth="yes"/>
-      <point x="1446" y="1044"/>
-      <point x="1470" y="995"/>
-      <point x="1470" y="845" type="curve" smooth="yes"/>
-      <point x="1470" y="736"/>
-      <point x="1468" y="624"/>
-      <point x="1452" y="506" type="curve" smooth="yes"/>
-      <point x="1444" y="448"/>
-      <point x="1256" y="-290"/>
-      <point x="699" y="-290" type="curve" smooth="yes"/>
-      <point x="157" y="-290"/>
-      <point x="157" y="395"/>
-      <point x="347" y="846" type="curve" smooth="yes"/>
-      <point x="356" y="868"/>
-      <point x="310" y="888"/>
-      <point x="300" y="868" type="curve" smooth="yes"/>
-      <point x="-79" y="153"/>
-      <point x="108" y="-630"/>
-      <point x="631" y="-630" type="curve" smooth="yes"/>
-      <point x="1160" y="-630"/>
-      <point x="1569" y="164"/>
-    </contour>
-    <contour>
-      <point x="3723" y="2950" type="curve" smooth="yes"/>
-      <point x="3723" y="2964"/>
-      <point x="3683" y="2977"/>
-      <point x="3618" y="3041" type="curve" smooth="yes"/>
-      <point x="3553" y="3107"/>
-      <point x="3540" y="3146"/>
-      <point x="3526" y="3147" type="curve"/>
-      <point x="3492" y="3147"/>
-      <point x="3341" y="2986"/>
-      <point x="3341" y="2950" type="curve" smooth="yes"/>
-      <point x="3341" y="2908"/>
-      <point x="3495" y="2752"/>
-      <point x="3538" y="2752" type="curve" smooth="yes"/>
-      <point x="3571" y="2752"/>
-      <point x="3724" y="2914"/>
-    </contour>
-    <contour>
-      <point x="2466" y="660" type="curve" smooth="yes"/>
-      <point x="2466" y="674"/>
-      <point x="2426" y="687"/>
-      <point x="2361" y="751" type="curve" smooth="yes"/>
-      <point x="2296" y="817"/>
-      <point x="2283" y="857"/>
-      <point x="2269" y="857" type="curve" smooth="yes"/>
-      <point x="2235" y="857"/>
-      <point x="2084" y="696"/>
-      <point x="2084" y="660" type="curve" smooth="yes"/>
-      <point x="2084" y="618"/>
-      <point x="2238" y="463"/>
-      <point x="2281" y="463" type="curve" smooth="yes"/>
-      <point x="2314" y="463"/>
-      <point x="2467" y="625"/>
-    </contour>
-    <contour>
-      <point x="2773" y="695" type="curve" smooth="yes"/>
-      <point x="2773" y="709"/>
-      <point x="2733" y="721"/>
-      <point x="2669" y="786" type="curve" smooth="yes"/>
-      <point x="2603" y="851"/>
-      <point x="2590" y="892"/>
-      <point x="2577" y="892" type="curve" smooth="yes"/>
-      <point x="2542" y="892"/>
-      <point x="2391" y="731"/>
-      <point x="2391" y="695" type="curve" smooth="yes"/>
-      <point x="2391" y="652"/>
-      <point x="2546" y="497"/>
-      <point x="2588" y="497" type="curve" smooth="yes"/>
-      <point x="2621" y="497"/>
-      <point x="2774" y="659"/>
-    </contour>
-  </outline>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/contents.plist b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/contents.plist
index 98403b24c..78adafa12 100644
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/contents.plist
+++ b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/contents.plist
@@ -2896,16 +2896,12 @@
   <string>ligA_layhiA_sS_alaam.glif</string>
   <key>ligAlayhiAsSalaam.alt</key>
   <string>ligA_layhiA_sS_alaam.alt.glif</string>
-  <key>ligAlayhiAsSalam.scratch</key>
-  <string>ligA_layhiA_sS_alam.scratch.glif</string>
   <key>ligAlayhimAsSalaam</key>
   <string>ligA_layhimA_sS_alaam.glif</string>
   <key>ligAlayhimaaAsSalaam</key>
   <string>ligA_layhimaaA_sS_alaam.glif</string>
   <key>ligAllahlong</key>
   <string>ligA_llahlong.glif</string>
-  <key>ligAllahlong.alt</key>
-  <string>ligA_llahlong.alt.glif</string>
   <key>ligBismillah</key>
   <string>ligB_ismillah.glif</string>
   <key>ligJallajalalouhou</key>
@@ -3220,38 +3216,6 @@
   <string>t.glif</string>
   <key>tab</key>
   <string>tab.glif</string>
-  <key>testAinGafJeemMeem</key>
-  <string>testA_inG_afJ_eemM_eem.glif</string>
-  <key>testAinGafJeemMeem.draft</key>
-  <string>testA_inG_afJ_eemM_eem.draft.glif</string>
-  <key>testAinKafBehReh</key>
-  <string>testA_inK_afB_ehR_eh.glif</string>
-  <key>testAlefTahHehgoalFeh</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.glif</string>
-  <key>testAlefTahHehgoalFeh.draft</key>
-  <string>testA_lefT_ahH_ehgoalF_eh.draft.glif</string>
-  <key>testDalSeenBariyeh</key>
-  <string>testD_alS_eenB_ariyeh.glif</string>
-  <key>testFehBehAinReh</key>
-  <string>testF_ehB_ehA_inR_eh.glif</string>
-  <key>testFehBehAinReh.draft</key>
-  <string>testF_ehB_ehA_inR_eh.draft.glif</string>
-  <key>testGafSeenHehdo</key>
-  <string>testG_afS_eenH_ehdo.glif</string>
-  <key>testHehdoDalHehdoAinJeem</key>
-  <string>testH_ehdoD_alH_ehdoA_inJ_eem.glif</string>
-  <key>testHehgoalSadQaf</key>
-  <string>testH_ehgoalS_adQ_af.glif</string>
-  <key>testJeemMeemaltLamWaw</key>
-  <string>testJ_eemM_eemaltL_amW_aw.glif</string>
-  <key>testJeemMeemaltLamWaw.draft</key>
-  <string>testJ_eemM_eemaltL_amW_aw.draft.glif</string>
-  <key>testKafSeenHehdo.draft</key>
-  <string>testK_afS_eenH_ehdo.draft.glif</string>
-  <key>testMeemKafReh</key>
-  <string>testM_eemK_afR_eh.glif</string>
-  <key>testSadBehLamNoon.draft</key>
-  <string>testS_adB_ehL_amN_oon.draft.glif</string>
   <key>thinSpace</key>
   <string>thinS_pace.glif</string>
   <key>thorn</key>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
deleted file mode 100644
index 5cfe7ab08..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_layhiA_sS_alam.scratch.glif
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAlayhiAsSalam.scratch" format="2">
-  <advance width="6136"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_llahlong.alt.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_llahlong.alt.glif
deleted file mode 100644
index 4bd1fc814..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/ligA_llahlong.alt.glif
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="ligAllahlong.alt" format="2">
-  <advance width="5737"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
deleted file mode 100644
index 60fd402b4..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem.draft" format="2">
-  <advance width="2891"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
deleted file mode 100644
index 92a4d39bb..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inG_afJ_eemM_eem.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinGafJeemMeem" format="2">
-  <advance width="2891"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inK_afB_ehR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inK_afB_ehR_eh.glif
deleted file mode 100644
index dcec846b0..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_inK_afB_ehR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAinKafBehReh" format="2">
-  <advance width="2919"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
deleted file mode 100644
index 9f5d2fc84..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh.draft" format="2">
-  <advance width="4688"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
deleted file mode 100644
index c88b0bee9..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testA_lefT_ahH_ehgoalF_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testAlefTahHehgoalFeh" format="2">
-  <advance width="4691"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testD_alS_eenB_ariyeh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testD_alS_eenB_ariyeh.glif
deleted file mode 100644
index 0400bcbe8..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testD_alS_eenB_ariyeh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testDalSeenBariyeh" format="2">
-  <advance width="3463"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
deleted file mode 100644
index e159e5b99..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh.draft" format="2">
-  <advance width="2841"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
deleted file mode 100644
index 553d19cd8..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testF_ehB_ehA_inR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testFehBehAinReh" format="2">
-  <advance width="2841"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testG_afS_eenH_ehdo.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testG_afS_eenH_ehdo.glif
deleted file mode 100644
index 215d76cf8..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testG_afS_eenH_ehdo.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testGafSeenHehdo" format="2">
-  <advance width="3490"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
deleted file mode 100644
index de89d485c..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehdoD_alH_ehdoA_inJ_eem.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehdoDalHehdoAinJeem" format="2">
-  <advance width="3209"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehgoalS_adQ_af.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehgoalS_adQ_af.glif
deleted file mode 100644
index c6bf17f4c..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testH_ehgoalS_adQ_af.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testHehgoalSadQaf" format="2">
-  <advance width="3646"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
deleted file mode 100644
index a31c2995b..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw.draft" format="2">
-  <advance width="2869"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
deleted file mode 100644
index 4b769a040..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testJ_eemM_eemaltL_amW_aw.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testJeemMeemaltLamWaw" format="2">
-  <advance width="2869"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
deleted file mode 100644
index 3db019437..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testK_afS_eenH_ehdo.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testKafSeenHehdo.draft" format="2">
-  <advance width="3490"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testM_eemK_afR_eh.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testM_eemK_afR_eh.glif
deleted file mode 100644
index 1b237cffa..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testM_eemK_afR_eh.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testMeemKafReh" format="2">
-  <advance width="2422"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.99,0.62,0.11,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif b/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif
deleted file mode 100644
index 91cf3e6d2..000000000
--- a/source/masters/AwamiNastaliq-Regular.ufo/glyphs/testS_adB_ehL_amN_oon.draft.glif
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glyph name="testSadBehLamNoon.draft" format="2">
-  <advance width="4062"/>
-  <outline/>
-  <lib>
-    <dict>
-      <key>com.schriftgestaltung.Glyphs.Export</key>
-      <false/>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
-</glyph>
diff --git a/source/masters/AwamiNastaliq-Regular.ufo/lib.plist b/source/masters/AwamiNastaliq-Regular.ufo/lib.plist
index de5bdd932..96d6001a0 100644
--- a/source/masters/AwamiNastaliq-Regular.ufo/lib.plist
+++ b/source/masters/AwamiNastaliq-Regular.ufo/lib.plist
@@ -37,10 +37,6 @@
   </dict>
   <key>com.schriftgestaltung.appVersion</key>
   <string>3260</string>
-  <key>com.schriftgestaltung.customParameter.GSFont.DisplayStrings</key>
-  <array>
-    <string>/ligRadiAllaahuAhn/ligRadiAllaahuAnhaa/ligRadiAllaahuAnhumaa/ligRadiAllaahuAnhunna</string>
-  </array>
   <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
   <true/>
   <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>