diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index 158da2295..c88580907 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -782,8 +782,8 @@ sub www_deleteConfirm {
 =cut
 
 sub www_deleteFile {
-        $_[0]->confirm(
-                WebGUI::International::get(728),
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
+        return $_[0]->confirm(WebGUI::International::get(728),
                 WebGUI::URL::page('func=deleteFileConfirm&wid='.$_[0]->get("wobjectId").'&file='.$session{form}{file}),
                 WebGUI::URL::page('func=edit&wid='.$_[0]->get("wobjectId"))
                 );
@@ -798,12 +798,9 @@ sub www_deleteFile {
 =cut
 
 sub www_deleteFileConfirm {
-        if (WebGUI::Privilege::canEditPage()) {
-                $_[0]->set({$session{form}{file}=>''});
-                return $_[0]->www_edit();
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
+	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
+        $_[0]->set({$session{form}{file}=>''});
+        return $_[0]->www_edit();
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Wobject/DownloadManager.pm b/lib/WebGUI/Wobject/DownloadManager.pm
index 32281149a..765ed212f 100644
--- a/lib/WebGUI/Wobject/DownloadManager.pm
+++ b/lib/WebGUI/Wobject/DownloadManager.pm
@@ -92,16 +92,8 @@ sub set {
 #-------------------------------------------------------------------
 sub www_deleteFile {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	my ($delete);
-	if ($session{form}{alt} == 1) {
-		$delete = "alternateVersion1";
-	} elsif ($session{form}{alt} == 2) {
-		$delete = "alternateVersion2";
-	} else {
-		$delete = "downloadFile";
-	}
-        WebGUI::SQL->write("update DownloadManager_file set $delete='' where downloadId=$session{form}{did}");
-       return $_[0]->www_editDownload();
+	$_[0]->setCollateral("DownloadManager_file","downloadId",{$session{form}{file}=>''},0,0);
+       	return $_[0]->www_editDownload();
 }
 
 #-------------------------------------------------------------------
@@ -199,21 +191,21 @@ sub www_editDownload {
         $f->hidden("func","editDownloadSave");
 	$f->text("fileTitle",WebGUI::International::get(5,$namespace),$download{fileTitle});
 	if ($download{downloadFile} ne "") {
-		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&wid='.
+		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&file=downloadFile&wid='.
 			$session{form}{wid}.'&did='.$session{form}{did}).'">'.WebGUI::International::get(391).
 			'</a>',WebGUI::International::get(6,$namespace));
         } else {
 		$f->file("downloadFile",WebGUI::International::get(6,$namespace));
         }
         if ($download{alternateVersion1} ne "") {
-		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=1&wid='.
+		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&file=alternateVersion1&wid='.
 			$session{form}{wid}.'&did='.$session{form}{did}).'">'.
 			WebGUI::International::get(391).'</a>',WebGUI::International::get(17,$namespace));
         } else {
 		$f->file("alternateVersion1",WebGUI::International::get(17,$namespace));
         }
         if ($download{alternateVersion2} ne "") {
-		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&alt=2&wid='.
+		$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&file=alternateVersion1&wid='.
 		$session{form}{wid}.'&did='.$session{form}{did}).'">'.
 			WebGUI::International::get(391).'</a>',WebGUI::International::get(18,$namespace));
         } else {
diff --git a/lib/WebGUI/Wobject/UserSubmission.pm b/lib/WebGUI/Wobject/UserSubmission.pm
index a8af0fc6e..7df6347ea 100644
--- a/lib/WebGUI/Wobject/UserSubmission.pm
+++ b/lib/WebGUI/Wobject/UserSubmission.pm
@@ -247,23 +247,10 @@ sub www_approveSubmission {
 }
 
 #-------------------------------------------------------------------
-sub www_deleteAttachment {
-	my ($owner);
-	($owner) = WebGUI::SQL->quickArray("select userId from UserSubmission_submission where submissionId=$session{form}{sid}");
+sub www_deleteFile {
+	my ($owner) = WebGUI::SQL->quickArray("select userId from UserSubmission_submission where submissionId=$session{form}{sid}");
         if ($owner == $session{user}{userId} || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
-                WebGUI::SQL->write("update UserSubmission_submission set attachment='' where submissionId=$session{form}{sid}");
-                return $_[0]->www_editSubmission();
-        } else {
-                return WebGUI::Privilege::insufficient();
-        }
-}
-
-#-------------------------------------------------------------------
-sub www_deleteImage {
-	my ($owner);
-	($owner) = WebGUI::SQL->quickArray("select userId from UserSubmission_submission where submissionId=$session{form}{sid}");
-        if ($owner == $session{user}{userId} || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
-                WebGUI::SQL->write("update UserSubmission_submission set image='' where submissionId=$session{form}{sid}");
+		$_[0]->setCollateral("UserSubmission_submission","submissionId",{$session{form}{file}=>''},0,0);
                 return $_[0]->www_editSubmission();
         } else {
                 return WebGUI::Privilege::insufficient();
@@ -377,13 +364,13 @@ sub www_editSubmission {
                 $f->text("title",WebGUI::International::get(35,$namespace),$submission->{title});
                 $f->HTMLArea("content",WebGUI::International::get(31,$namespace),$submission->{content});
                 if ($submission->{image} ne "") {
-			$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteImage&wid='.$session{form}{wid}.'&sid='.$submission->{submissionId}).'">'
+			$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&file=image&wid='.$session{form}{wid}.'&sid='.$submission->{submissionId}).'">'
 				.WebGUI::International::get(391).'</a>',WebGUI::International::get(32,$namespace));
                 } else {
 			$f->file("image",WebGUI::International::get(32,$namespace));
                 }
                 if ($submission->{attachment} ne "") {
-			$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteAttachment&wid='.$session{form}{wid}
+			$f->readOnly('<a href="'.WebGUI::URL::page('func=deleteFile&file=attachment&wid='.$session{form}{wid}
 				.'&sid='.$submission->{submissionId}).'">'
 				.WebGUI::International::get(391).'</a>',WebGUI::International::get(33,$namespace));
                 } else {