diff --git a/doc/source/images/image_status_transition.png b/doc/source/images/image_status_transition.png
index a0e4e81a..c21cca20 100644
Binary files a/doc/source/images/image_status_transition.png and b/doc/source/images/image_status_transition.png differ
diff --git a/doc/source/images_src/image_status_transition.dot b/doc/source/images_src/image_status_transition.dot
index 353fae5e..036b3040 100644
--- a/doc/source/images_src/image_status_transition.dot
+++ b/doc/source/images_src/image_status_transition.dot
@@ -34,10 +34,10 @@ digraph {
   "queued" -> "deleted" [label="delete"];
 
   "saving" -> "active" [label="upload succeed"];
-  "saving" -> "killed" [label="upload fail"];
+  "saving" -> "killed" [label="[v1] upload fail"];
+  "saving" -> "queued" [label="[v2] upload fail"];
   "saving" -> "deleted" [label="delete"];
 
-  "active" -> "queued" [label="remove location*"];
   "active" -> "pending_delete" [label="delayed delete"];
   "active" -> "deleted" [label="delete"];
   "active" -> "deactivated" [label="deactivate"];
diff --git a/doc/source/statuses.rst b/doc/source/statuses.rst
index 0690e453..526adfdb 100644
--- a/doc/source/statuses.rst
+++ b/doc/source/statuses.rst
@@ -71,9 +71,6 @@ Images in Glance can be in one the following statuses:
 
    * Add location from zero to more than one.
 
-   * Remove location from one or more to zero by PATCH method which is only
-     supported in v2.
-
 Task Statuses
 ==============
 
diff --git a/glance/domain/__init__.py b/glance/domain/__init__.py
index 2efb828e..a77bf020 100644
--- a/glance/domain/__init__.py
+++ b/glance/domain/__init__.py
@@ -103,7 +103,7 @@ class Image(object):
         # can be retried.
         'queued': ('saving', 'active', 'deleted'),
         'saving': ('active', 'killed', 'deleted', 'queued'),
-        'active': ('queued', 'pending_delete', 'deleted', 'deactivated'),
+        'active': ('pending_delete', 'deleted', 'deactivated'),
         'killed': ('deleted',),
         'pending_delete': ('deleted',),
         'deleted': (),