diff --git a/app/assets/javascripts/documentable.js b/app/assets/javascripts/documentable.js
index 3a823dab7..03d0a0f02 100644
--- a/app/assets/javascripts/documentable.js
+++ b/app/assets/javascripts/documentable.js
@@ -76,7 +76,6 @@
     buildData: function(data, input) {
       var wrapper;
       wrapper = $(input).closest(".direct-upload");
-      data.input = input;
       data.wrapper = wrapper;
       data.progressBar = $(wrapper).find(".progress-bar-placeholder");
       data.errorContainer = $(wrapper).find(".attachment-errors");
@@ -133,11 +132,7 @@
         },
         complete: function() {
           App.Documentable.unlockUploads();
-          if ($(data.input).data("nested-document") === true) {
-            $(data.wrapper).remove();
-          } else {
-            $(data.wrapper).find("a.remove-cached-attachment").remove();
-          }
+          $(data.wrapper).remove();
         }
       });
     },
diff --git a/app/assets/javascripts/imageable.js b/app/assets/javascripts/imageable.js
index 86ef7346e..75b68ed40 100644
--- a/app/assets/javascripts/imageable.js
+++ b/app/assets/javascripts/imageable.js
@@ -72,7 +72,6 @@
     buildData: function(data, input) {
       var wrapper;
       wrapper = $(input).closest(".direct-upload");
-      data.input = input;
       data.wrapper = wrapper;
       data.progressBar = $(wrapper).find(".progress-bar-placeholder");
       data.preview = $(wrapper).find(".image-preview");
@@ -133,11 +132,7 @@
         },
         complete: function() {
           $("#new_image_link").removeClass("hide");
-          if ($(data.input).data("nested-image") === true) {
-            $(data.wrapper).remove();
-          } else {
-            $(data.wrapper).find("a.remove-cached-attachment").remove();
-          }
+          $(data.wrapper).remove();
         }
       });
     },
diff --git a/app/components/documents/fields_component.rb b/app/components/documents/fields_component.rb
index 4d503d912..3aa0126bf 100644
--- a/app/components/documents/fields_component.rb
+++ b/app/components/documents/fields_component.rb
@@ -39,10 +39,7 @@ class Documents::FieldsComponent < ApplicationComponent
         label_options: { class: "button hollow #{klass}" },
         accept: accepted_content_types_extensions,
         class: "js-document-attachment",
-        data: {
-          url: direct_upload_path,
-          nested_document: true
-        }
+        data: { url: direct_upload_path }
     end
 
     def direct_upload_path
diff --git a/app/components/images/fields_component.rb b/app/components/images/fields_component.rb
index 0cc91d28c..9b6ceb80d 100644
--- a/app/components/images/fields_component.rb
+++ b/app/components/images/fields_component.rb
@@ -40,10 +40,7 @@ class Images::FieldsComponent < ApplicationComponent
         label_options: { class: "button hollow #{klass}" },
         accept: accepted_content_types_extensions,
         class: "js-image-attachment",
-        data: {
-          url: direct_upload_path,
-          nested_image: true
-        }
+        data: { url: direct_upload_path }
     end
 
     def direct_upload_path