diff --git a/docs/upgrades/upgrade_5.2.5-5.3.0.pl b/docs/upgrades/upgrade_5.2.5-5.3.0.pl
index 8fb9ec593..0d3be07cf 100644
--- a/docs/upgrades/upgrade_5.2.5-5.3.0.pl
+++ b/docs/upgrades/upgrade_5.2.5-5.3.0.pl
@@ -47,6 +47,8 @@ $conf->write;
 print "\tRemoving unneeded files.\n" unless ($quiet);
 
 unlink("../../lib/WebGUI/Wobject/MailForm.pm");
+unlink("../../www/extras/floatCheck.js");
+unlink("../../www/extras/numberCheck.js");
 
 
 print "\tMigrating Mail Form to Data Form.\n" unless ($quiet);
@@ -80,20 +82,20 @@ my $sth = WebGUI::SQL->read("select * from DataForm");
 while (my %dataform = $sth->hash) {
 	my $startInsert = "insert into DataForm_field (wobjectId, DataForm_fieldId, sequenceNumber, name, status, type, 
 		defaultValue, width, isMailField, label) values";
-	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -5, "from", 
-		".quote($dataform{fromStatus}).", "email", ".quote($dataform{fromField}).", $dataform{width}, 1,
+	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -5, 'from', 
+		".quote($dataform{fromStatus}).", 'email', ".quote($dataform{fromField}).", $dataform{width}, 1,
 		".quote(WebGUI::International::get(10,"DataForm")).")");
-	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -4, "to", 
-		".quote($dataform{toStatus}).", "email", ".quote($dataform{toField}).", $dataform{width}, 1,
+	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -4, 'to', 
+		".quote($dataform{toStatus}).", 'email', ".quote($dataform{toField}).", $dataform{width}, 1,
 		".quote(WebGUI::International::get(11,"DataForm")).")");
-	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -3, "cc", 
-		".quote($dataform{ccStatus}).", "email", ".quote($dataform{ccField}).", $dataform{width}, 1,
+	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -3, 'cc', 
+		".quote($dataform{ccStatus}).", 'email', ".quote($dataform{ccField}).", $dataform{width}, 1,
 		".quote(WebGUI::International::get(12,"DataForm")).")");
-	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -2, "bcc", 
-		".quote($dataform{bccStatus}).", "email", ".quote($dataform{bccField}).", $dataform{width}, 1,
+	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -2, 'bcc', 
+		".quote($dataform{bccStatus}).", 'email', ".quote($dataform{bccField}).", $dataform{width}, 1,
 		".quote(WebGUI::International::get(13,"DataForm")).")");
-	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -1, "subject", 
-		".quote($dataform{subjectStatus}).", "text", ".quote($dataform{subjectField}).", $dataform{width}, 1,
+	WebGUI::SQL->write($startInsert." ($dataform{wobjectId}, ".getNext("DataForm_fieldId").", -1, 'subject', 
+		".quote($dataform{subjectStatus}).", 'text', ".quote($dataform{subjectField}).", $dataform{width}, 1,
 		".quote(WebGUI::International::get(14,"DataForm")).")");
 	my $i = 1;
         my $sth2 = WebGUI::SQL->read("select DataForm_fieldId from DataForm_field where wobjectId=$dataform{wobjectId} order by sequenceNumber");