diff --git a/needles/gnome/buttons/apps_menu_button-20210316.json b/needles/gnome/buttons/apps_menu_button-20210316.json
deleted file mode 100644
index 34fc0c0b..00000000
--- a/needles/gnome/buttons/apps_menu_button-20210316.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 15,
-      "height": 15,
-      "ypos": 9,
-      "type": "match",
-      "width": 67
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "apps_menu_button",
-    "apps_menu_button_inactive"
-  ]
-}
diff --git a/needles/gnome/buttons/apps_menu_button-20210316.png b/needles/gnome/buttons/apps_menu_button-20210316.png
deleted file mode 100644
index 7f2ecfcc..00000000
Binary files a/needles/gnome/buttons/apps_menu_button-20210316.png and /dev/null differ
diff --git a/needles/gnome/buttons/apps_menu_button-20211109.json b/needles/gnome/buttons/apps_menu_button-20211109.json
deleted file mode 100644
index b571a6cb..00000000
--- a/needles/gnome/buttons/apps_menu_button-20211109.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 15,
-      "height": 15,
-      "type": "match",
-      "ypos": 10,
-      "width": 67
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "apps_menu_button",
-    "apps_menu_button_inactive"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/apps_menu_button-20211109.png b/needles/gnome/buttons/apps_menu_button-20211109.png
deleted file mode 100644
index 59387497..00000000
Binary files a/needles/gnome/buttons/apps_menu_button-20211109.png and /dev/null differ
diff --git a/needles/gnome/buttons/apps_menu_button-f33-20210715.json b/needles/gnome/buttons/apps_menu_button-f33-20210715.json
deleted file mode 100644
index 42c2a119..00000000
--- a/needles/gnome/buttons/apps_menu_button-f33-20210715.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "area": [
-    {
-      "height": 15,
-      "xpos": 9,
-      "type": "match",
-      "ypos": 7,
-      "width": 67
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "apps_menu_button",
-    "apps_menu_button_inactive"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/apps_menu_button-f33-20210715.png b/needles/gnome/buttons/apps_menu_button-f33-20210715.png
deleted file mode 100644
index da3c8847..00000000
Binary files a/needles/gnome/buttons/apps_menu_button-f33-20210715.png and /dev/null differ
diff --git a/needles/gnome/buttons/apps_menu_button_active-20210316.json b/needles/gnome/buttons/apps_menu_button_active-20210316.json
deleted file mode 100644
index f7bee50a..00000000
--- a/needles/gnome/buttons/apps_menu_button_active-20210316.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "area": [
-    {
-      "height": 15,
-      "xpos": 15,
-      "ypos": 9,
-      "type": "match",
-      "width": 67
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "apps_menu_button",
-    "apps_menu_button_active"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/apps_menu_button_active-20210316.png b/needles/gnome/buttons/apps_menu_button_active-20210316.png
deleted file mode 100644
index 5b9602b2..00000000
Binary files a/needles/gnome/buttons/apps_menu_button_active-20210316.png and /dev/null differ
diff --git a/needles/gnome/buttons/apps_menu_button_active-20211109.json b/needles/gnome/buttons/apps_menu_button_active-20211109.json
deleted file mode 100644
index 7453dd3e..00000000
--- a/needles/gnome/buttons/apps_menu_button_active-20211109.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "ypos": 10,
-      "width": 67,
-      "xpos": 15,
-      "height": 15
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "DESKTOP-gnome",
-    "ENV-DISTRI-fedora",
-    "LANGUAGE-english",
-    "apps_menu_button",
-    "apps_menu_button_active"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/apps_menu_button_active-20211109.png b/needles/gnome/buttons/apps_menu_button_active-20211109.png
deleted file mode 100644
index a0825e9d..00000000
Binary files a/needles/gnome/buttons/apps_menu_button_active-20211109.png and /dev/null differ
diff --git a/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.json b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.json
deleted file mode 100644
index e1412ee5..00000000
--- a/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 357,
-      "width": 50,
-      "ypos": 585,
-      "height": 16,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gnome_button_credits"
-  ]
-}
diff --git a/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.png b/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.png
deleted file mode 100644
index 4d43e703..00000000
Binary files a/needles/gnome/buttons/gnome_button_credits-libadwaita-20220722.png and /dev/null differ
diff --git a/needles/gnome/buttons/gnome_button_cross_remove-20220627.json b/needles/gnome/buttons/gnome_button_cross_remove-20220627.json
deleted file mode 100644
index 4736518c..00000000
--- a/needles/gnome/buttons/gnome_button_cross_remove-20220627.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 761,
-      "width": 16,
-      "height": 16,
-      "ypos": 201,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gnome_button_cross_remove"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_cross_remove-20220627.png b/needles/gnome/buttons/gnome_button_cross_remove-20220627.png
deleted file mode 100644
index 0b64efcb..00000000
Binary files a/needles/gnome/buttons/gnome_button_cross_remove-20220627.png and /dev/null differ
diff --git a/needles/gnome/buttons/gnome_button_open-boldblue-20220316.json b/needles/gnome/buttons/gnome_button_open-boldblue-20220316.json
deleted file mode 100644
index db07bb63..00000000
--- a/needles/gnome/buttons/gnome_button_open-boldblue-20220316.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 16,
-      "ypos": 206,
-      "width": 42,
-      "type": "match",
-      "xpos": 886
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gnome_button_open"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_open-boldblue-20220316.png b/needles/gnome/buttons/gnome_button_open-boldblue-20220316.png
deleted file mode 100644
index cf33dd2f..00000000
Binary files a/needles/gnome/buttons/gnome_button_open-boldblue-20220316.png and /dev/null differ
diff --git a/needles/gnome/buttons/gnome_button_save-boldblue-20220316.json b/needles/gnome/buttons/gnome_button_save-boldblue-20220316.json
deleted file mode 100644
index e98a6c55..00000000
--- a/needles/gnome/buttons/gnome_button_save-boldblue-20220316.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "width": 40,
-      "ypos": 227,
-      "height": 20,
-      "xpos": 891
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gnome_button_save_blue"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_button_save-boldblue-20220316.png b/needles/gnome/buttons/gnome_button_save-boldblue-20220316.png
deleted file mode 100644
index fd69cd76..00000000
Binary files a/needles/gnome/buttons/gnome_button_save-boldblue-20220316.png and /dev/null differ
diff --git a/needles/gnome/buttons/gnome_select_button-20220722.json b/needles/gnome/buttons/gnome_select_button-20220722.json
deleted file mode 100644
index f07d70f3..00000000
--- a/needles/gnome/buttons/gnome_select_button-20220722.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 887,
-      "width": 46,
-      "type": "match",
-      "height": 20,
-      "ypos": 250
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "gnome_select_button"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/gnome_select_button-20220722.png b/needles/gnome/buttons/gnome_select_button-20220722.png
deleted file mode 100644
index 1520337b..00000000
Binary files a/needles/gnome/buttons/gnome_select_button-20220722.png and /dev/null differ
diff --git a/needles/gnome/buttons/next_button-bold-20220813.json b/needles/gnome/buttons/next_button-bold-20220813.json
deleted file mode 100644
index 43d7ffcc..00000000
--- a/needles/gnome/buttons/next_button-bold-20220813.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 55,
-      "xpos": 956,
-      "height": 25,
-      "ypos": 42,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "next_button",
-    "LANGUAGE-english"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/next_button-bold-20220813.png b/needles/gnome/buttons/next_button-bold-20220813.png
deleted file mode 100644
index 8431337d..00000000
Binary files a/needles/gnome/buttons/next_button-bold-20220813.png and /dev/null differ
diff --git a/needles/gnome/buttons/next_button-startsetup-20220813.json b/needles/gnome/buttons/next_button-startsetup-20220813.json
deleted file mode 100644
index e537d967..00000000
--- a/needles/gnome/buttons/next_button-startsetup-20220813.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 697,
-      "width": 79,
-      "type": "match",
-      "height": 21,
-      "xpos": 473
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "start_setup",
-    "LANGUAGE-english"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/next_button-startsetup-20220813.png b/needles/gnome/buttons/next_button-startsetup-20220813.png
deleted file mode 100644
index 73399279..00000000
Binary files a/needles/gnome/buttons/next_button-startsetup-20220813.png and /dev/null differ
diff --git a/needles/gnome/buttons/skip_button-bold-20220813.json b/needles/gnome/buttons/skip_button-bold-20220813.json
deleted file mode 100644
index cef1283f..00000000
--- a/needles/gnome/buttons/skip_button-bold-20220813.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 46,
-      "width": 32,
-      "type": "match",
-      "height": 21,
-      "xpos": 970
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "skip_button",
-    "LANGUAGE-english"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/skip_button-bold-20220813.png b/needles/gnome/buttons/skip_button-bold-20220813.png
deleted file mode 100644
index c2a3590a..00000000
Binary files a/needles/gnome/buttons/skip_button-bold-20220813.png and /dev/null differ
diff --git a/needles/gnome/buttons/system_menu_button-20210204.json b/needles/gnome/buttons/system_menu_button-20210204.json
deleted file mode 100644
index 8ac3c341..00000000
--- a/needles/gnome/buttons/system_menu_button-20210204.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 24,
-      "type": "match",
-      "height": 22,
-      "ypos": 5,
-      "xpos": 987
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "system_menu_button"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/system_menu_button-20210204.png b/needles/gnome/buttons/system_menu_button-20210204.png
deleted file mode 100644
index 035b4001..00000000
Binary files a/needles/gnome/buttons/system_menu_button-20210204.png and /dev/null differ
diff --git a/needles/gnome/buttons/system_menu_button-20210715.json b/needles/gnome/buttons/system_menu_button-20210715.json
deleted file mode 100644
index 5b06881b..00000000
--- a/needles/gnome/buttons/system_menu_button-20210715.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 24,
-      "type": "match",
-      "ypos": 5,
-      "xpos": 987,
-      "height": 22
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "system_menu_button"
-  ]
-}
\ No newline at end of file
diff --git a/needles/gnome/buttons/system_menu_button-20210715.png b/needles/gnome/buttons/system_menu_button-20210715.png
deleted file mode 100644
index df4bf107..00000000
Binary files a/needles/gnome/buttons/system_menu_button-20210715.png and /dev/null differ