diff --git a/lib/WebGUI/Form.pm b/lib/WebGUI/Form.pm
index 1ceb8dbde..753c4b92b 100644
--- a/lib/WebGUI/Form.pm
+++ b/lib/WebGUI/Form.pm
@@ -660,19 +660,6 @@ sub HTMLArea {
                 	$output .= '<script>'."\n";
                 	$output .= '_editor_url = "'.$session{config}{extras}.'/htmlArea/";'."\n";
                 	$output .= '</script>'."\n";
-                	$output .= '<script language="JavaScript">
-                       		var formObj;
-                       		var extrasDir="'.$session{config}{extras}.'";
-                       		function openEditWindow(obj) {
-                       		formObj = obj;
-                       		if (navigator.userAgent.substr(navigator.userAgent.indexOf("MSIE")+5,1)>=5)
-                         		window.open("'.$session{config}{extras}.'/ieEdit.html","editWindow","width=490,height=400,resizable=1");
-                       		else
-                        		 window.open("'.$session{config}{extras}.'/nonIeEdit.html","editWindow","width=500,height=410");
-                       		}
-                       		function setContent(content) {
-                         		formObj.value = content;
-                       		} </script>';
 			$htmlArea = 1;
 		} elsif ($browser->ie && $browser->version >= 5) {
 			$output .= '<script language="JavaScript">
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index ab98ca3c1..6ba5bb582 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -222,7 +222,6 @@ sub www_editSubmission {
         my ($output, $submission, $f, @submission, $sth);
         $submission = $_[0]->getCollateral("USS_submission","USS_submissionId",$session{form}{sid});
 	if ($submission->{USS_submissionId} eq "new") {
-		$submission->{convertCarriageReturns} = 1;
 		$submission->{userId} = $session{user}{userId};
 	}
         if (WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute")) || $submission->{userId} == $session{user}{userId} || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {