diff --git a/next.json b/next.json
index f8688a5a..ed2b02ff 100644
--- a/next.json
+++ b/next.json
@@ -78,15 +78,15 @@
         "compute-auth-create",
         "compute-auth-get",
         "compute-auth-set",
-        "compute-images-delete",
-        "compute-images-get",
-        "compute-images-list",
         "compute-volume-get",
         "compute-volume-list"
       ],
       "removed": [
         "identity-v2-tokens-create",
-        "compute-servers-change"
+        "compute-servers-change",
+        "compute-images-delete",
+        "compute-images-get",
+        "compute-images-list"
       ]
     },
     "object": {
@@ -234,179 +234,6 @@
         }
       }
     },
-    "compute-images-delete": {
-      "achievements": [
-        "complete",
-        "doc",
-        "proximity",
-        "clients",
-        "discover",
-        "sticky",
-        "atomic",
-        "stable",
-        "tools"
-      ],
-      "admin": false,
-      "description": "Image operations within the Compute API",
-      "project": "nova",
-      "required-since": "",
-      "tests": {
-        "tempest.api.compute.images.test_images.ImagesTestJSON.test_delete_saving_image": {
-          "idempotent_id": "id-aa06b52b-2db5-4807-b218-9441f75d74e3"
-        }
-      }
-    },
-    "compute-images-get": {
-      "achievements": [
-        "complete",
-        "doc",
-        "proximity",
-        "clients",
-        "discover",
-        "sticky",
-        "atomic",
-        "stable",
-        "tools"
-      ],
-      "admin": false,
-      "description": "Image operations within the Compute API",
-      "project": "nova",
-      "required-since": "",
-      "tests": {
-        "tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_get_image": {
-          "idempotent_id": "id-490d0898-e12a-463f-aef0-c50156b9f789"
-        }
-      }
-    },
-    "compute-images-list": {
-      "achievements": [
-        "complete",
-        "doc",
-        "proximity",
-        "clients",
-        "discover",
-        "sticky",
-        "atomic",
-        "stable",
-        "tools"
-      ],
-      "admin": false,
-      "description": "Image operations within the Compute API",
-      "project": "nova",
-      "required-since": "",
-      "tests": {
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_changes_since": {
-          "idempotent_id": "id-18bac3ae-da27-436c-92a9-b22474d13aab",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_name": {
-          "idempotent_id": "id-33163b73-79f5-4d07-a7ea-9213bcc468ff",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_server_id": {
-          "idempotent_id": "id-9f238683-c763-45aa-b848-232ec3ce3105",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_server_ref": {
-          "idempotent_id": "id-05a377b8-28cf-4734-a1e6-2ab5c38bf606",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_status": {
-          "idempotent_id": "id-a3f5b513-aeb3-42a9-b18e-f091ef73254d",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_filter_by_type": {
-          "idempotent_id": "id-e3356918-4d3e-4756-81d5-abc4524ba29f",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_limit_results": {
-          "idempotent_id": "id-3a484ca9-67ba-451e-b494-7fcf28d32d62",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_filter_by_changes_since": {
-          "idempotent_id": "id-7d439e18-ac2e-4827-b049-7e18004712c4",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_filter_by_name": {
-          "idempotent_id": "id-644ea267-9bd9-4f3b-af9f-dffa02396a17",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_filter_by_server_ref": {
-          "idempotent_id": "id-8c78f822-203b-4bf6-8bba-56ebd551cf84",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_filter_by_status": {
-          "idempotent_id": "id-9b0ea018-6185-4f71-948a-a123a107988e",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_filter_by_type": {
-          "idempotent_id": "id-888c0cc0-7223-43c5-9db0-b125fd0a393b",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON.test_list_images_with_detail_limit_results": {
-          "idempotent_id": "id-ba2fa9a9-b672-47cc-b354-3b4c0600e2cb",
-          "flagged": {
-            "date": "2015-05-06",
-            "reason": "D405 Test implicitly depends on Glance v1 API, which is a SUPPORTED but not the CURRENT version. Vendors may have Glance v1 disabled in favor of Glance v2.",
-            "action": "Implement v2 support for Glance v2 API in Nova. Fix implicit dependency on Glance v1 in test."
-          }
-        },
-        "tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images": {
-          "idempotent_id": "id-fd51b7f4-d4a3-4331-9885-866658112a6f"
-        },
-        "tempest.api.compute.images.test_list_images.ListImagesTestJSON.test_list_images_with_detail": {
-          "idempotent_id": "id-9f94cb6b-7f10-48c5-b911-a0b84d7d4cd6"
-        }
-      }
-    },
     "compute-instance-actions-get": {
       "achievements": [
         "foundation",