diff --git a/www/extras/wobject/Survey/editsurvey/answer.js b/www/extras/wobject/Survey/editsurvey/answer.js
deleted file mode 100644
index f9fdabac7..000000000
--- a/www/extras/wobject/Survey/editsurvey/answer.js
+++ /dev/null
@@ -1,69 +0,0 @@
-if (typeof Survey == "undefined") {
-    var Survey = {};
-}
-
-Survey.AnswerTemplate = new function(){
-    this.params;
-    this.loadAnswer = function(params){
-        for(var p in params){
-            if(params[p] == undefined){params[p] = '';}
-        }
-
-        var html = "\
-            <div id='answer'>\
-            <div class='hd'>Please enter answer information</div>\
-                <div class='bd'>\
-\
-                    <form name='form' method='POST' action='?func=submitAnswerEdit'>\
-\
-                    <p>Answer Number: "+params.sequenceNumber + "\
-\
-                    <input type='hidden' name='Survey_sectionId' value='"+params.Survey_sectionId+"'>\
-                    <input type='hidden' name='Survey_questionId' value='"+params.Survey_questionId+"'>\
-                    <input type='hidden' name='Survey_answerId' value='"+params.Survey_answerId+"'>";
-        html = html + "<p>Answer Text:\n<textarea name='answerText'>"+params.answerText+"</textArea>\n";
-        html = html + "<p>Recorded Answer\n<textarea name='recordedAnswer'>"+params.recordedAnswer+"</textArea>\n";
-        html = html + "<p>Jump to:<input type=text value='"+params.gotoQuestion+"' name=gotoQuestion size=4>";
-        html = html + "<span id='textParams'><p>Text Answer Cols:<input type=text size=2 value='"+params.textCols+"' name=textCols> Rows: \
-            <input type=text size=2 value='"+params.textRows+"' name=textRows> </p></span>";
-        html = html + "<p>Is this the correct answer:\n" + 
-            this.makeRadio('isCorrect',[{text:'Yes',value:1},{text:'No',value:0}],params.isCorrect);
-        html = html + "<p>Min:<input type=text value='"+params.min+"' name=min size=2>";
-        html = html + "<p>Max:<input type=text value='"+params.max+"' name=max size=2>";
-        html = html + "<p>Step:<input type=text value='"+params.step+"' name=step size=2>";
-        html = html + "<p>Verbatim:\n" + 
-            this.makeRadio('verbatim',[{text:'Yes',value:1},{text:'No',value:0}],params.verbatim);
-        document.getElementById('edit').innerHTML = html;
-
-        var butts = [{ text:"Submit", handler:function(){this.submit();}, isDefault:true },{ text:"Cancel", handler:function(){this.cancel();}} ];
-        if(params.Survey_answerId != ''){
-            butts[2] = { text:"Delete", handler:function(){Survey.Comm.deleteAnswer(Survey.AnswerTemplate.params.Survey_answerId);}};
-        }
-
-        var form = new YAHOO.widget.Dialog("answer",
-            { width : "500px",
-              fixedcenter : true,
-              visible : false,
-              constraintoviewport : true,
-              buttons : butts
-            });
-
-        form.callback = Survey.Comm.callback;
-        form.render();
-        form.show();
-        this.params = params;
-    };
-
-    this.makeRadio = function(name,values,checked){
-        var html = '';
-        for(var i in values){
-            if(checked == values[i]['value']){
-                html = html+ "<input type='radio' name='" + name + "' value='" + values[i]['value'] + "' checked>" + values[i]['text'];
-            }else{
-                html = html+ "<input type='radio' name='" + name + "' value='" + values[i]['value'] + "' >" + values[i]['text'];
-            }
-        }
-        html = html + "\n";
-        return html;
-    }
-}();
diff --git a/www/extras/wobject/Survey/editsurvey/question.html b/www/extras/wobject/Survey/editsurvey/question.html
deleted file mode 100644
index e63ace0ea..000000000
--- a/www/extras/wobject/Survey/editsurvey/question.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id='question'>
-<div class='hd'>Please enter question information</div>
-<div class='bd'>
-    <form name='form' method='POST' action='?func=submitObjectEdit'>
-    <p>Question Number: <tmpl_var displayed_id>
-    <input type='hidden' name='id' value='<tmpl_var id>'>
-    <p>Question Text:\n";
-    <textarea name='questionText'><tmpl_var text></textArea>\n";
-    <p>Question variable name:<input maxlength=35 size=10 type=text value='<tmpl_var variable>' name=variable size=2></p>";
-    <p>Randomize answers:";
-        <input type='radio' name='randomizeAnswers' value=1 <tmpl_if randomizeAnswers>checked</tmpl_if>>Yes
-        <input type='radio' name='randomizeAnswers' value=0 <tmpl_unless randomizeAnswers>checked</tmpl_unless>>No
-    <p>Question type:
-    <select name='questionType'>
-    <tmpl_loop questionType>
-        <option value='<tmpl_var text>' <tmpl_if selected>selected</tmpl_if>><tmpl_var text></option>
-    </tmpl_loop>
-    </select>
-    <p>Randomized words:
-    <textarea name=randomizWords><tmpl_var randomWords></textArea>
-    <p>Vertical display:
-        <input type='radio' name='verticalDisplay' value=1 <tmpl_if verticalDisplay>checked</tmpl_if>>Yes
-        <input type='radio' name='verticalDisplay' value=0 <tmpl_unless verticalDisplay>checked</tmpl_unless>>No
-
-    <p>Show text in button:
-        <input type='radio' name='textInButton' value=1 <tmpl_if textInButton>checked</tmpl_if>>Yes
-        <input type='radio' name='textInButton' value=0 <tmpl_unless textInButton>checked</tmpl_unless>>No
-
-    <p>Allow comment:
-        <input type='radio' name='allowComment' value=1 <tmpl_if allowComment>checked</tmpl_if>>Yes
-        <input type='radio' name='allowComment' value=0 <tmpl_unless allowComment>checked</tmpl_unlexx>>No
-    <span id='commentParams'><p>&nbsp;&nbsp; Cols:<input type=text size=2 value='<tmpl_var commentCols>' name=commentCols> Rows: 
-            <input type=text size=2 value='<tmpl_var commentRows>' name=commentRows> </p></span>
-    <p>Maximum number of answers:<input type=text value='<tmpl_var maxAnswers>' name=maxAnswers size=2>
-    <p>Required:
-        <input type='radio' name='required' value=1 <tmpl_if required>checked</tmpl_if>>Yes
-        <input type='radio' name='required' value=0 <tmpl_unless required>checked</tmpl_unless>>No
-</form>
-</div>
-</div>
diff --git a/www/extras/wobject/Survey/editsurvey/question.js b/www/extras/wobject/Survey/editsurvey/question.js
deleted file mode 100644
index 214c4b28b..000000000
--- a/www/extras/wobject/Survey/editsurvey/question.js
+++ /dev/null
@@ -1,112 +0,0 @@
-if (typeof Survey == "undefined") {
-    var Survey = {};
-}
-
-Survey.QuestionTemplate = new function(){
-
-    this.loadQuestion = function(params){
-
-        for(var p in params){
-            if(params[p] == undefined){params[p] = '';}
-        } 
-
-        var html = "\
-            <div id='question'>\
-                <div class='hd'>Please enter question information</div>\
-                <div class='bd'>\
-\
-                    <form name='form' method='POST' action='?func=submitQuestionEdit'>\
-                    <p>Question Number: "+params.sequenceNumber + "\
-\
-                    <input type='hidden' name='Survey_sectionId' value='"+params.Survey_sectionId+"'>\
-                    <input type='hidden' name='Survey_questionId' value='"+params.Survey_questionId+"'>\
-                    <p>Question Text:\n";
-        if(params.questionText == ''){
-            html = html + "<textarea name='questionText'>Enter Text Here</textArea>\n";
-        }
-        else{
-            html = html + "<textarea name='questionText'>"+params.questionText+"</textArea>\n";
-        }
-        html = html + "<p>Question variable name:<input maxlength=35 size=10 type=text value='"+ params.questionVariable +"' name=questionVariable size=2></p>";
-        html = html + "<p>Randomize answers:";
- 
-        html = html+ this.makeRadio('randomizeAnswers',[{text:'Yes',value:1},{text:'No',value:0}],params.randomizeAnswers);
-        html = html + "<p>Question type:";
-        var questions = ['Agree/Disagree','Certainty','Concern','Confidence','Currency','Date','Date Range','Dual Slider - Range','Education','Effectiveness',
-            'Email','File Upload','Gender','Hidden','Ideology','Importance','Likelihood','Multi Slider - Allocate','Multiple Choice','Oppose/Support',
-            'Party','Phone Number','Race','Risk','Satisfaction','Scale','Security','Slider','Text','Text Date','Threat','True/False','Yes/No'];
-//        var questions = ['Multiple Choice','Gender','Yes/No','True/False','Agree/Disagree','Oppose/Support','Importance','Likelihood','Certainty','Satisfaction',
-//            'Confidence','Effectiveness','Concern','Risk','Threat','Security','Ideology','Race','Party','Education',
-//            'Text', 'Email', 'Phone Number', 'Text Date', 'Currency',
-//            'Slider','Dual Slider - Range','Multi Slider - Allocate', 'Date','Date Range', 'File Upload','Hidden'];
-
-        html = html + this.makeMenu('questionType',questions,questions,params.questionType);
-        
-        html = html + "\
-                    <p>Randomized words:\
-                        <textarea name=randomizedWords>"+params.randomizedWords+"</textArea>\
-                    <p>Vertical display:";
-
-        html = html+ this.makeRadio('verticalDisplay',[{text:'Yes',value:1},{text:'No',value:0}],params.verticalDisplay);
-        html = html + "<p>Show text in button:";
-        html = html + this.makeRadio('textInButton',[{text:'Yes',value:1},{text:'No',value:0}],params.textInButton);
-        html = html + "<p>Allow comment:";
-        html = html + this.makeRadio('allowComment',[{text:'Yes',value:1},{text:'No',value:0}],params.allowComment);
-        html = html + "<span id='commentParams'><p>&nbsp;&nbsp; Cols:<input type=text size=2 value='"+params.commentCols+"' name=commentCols> Rows: \
-            <input type=text size=2 value='"+params.commentRows+"' name=commentRows> </p></span>";
-        html = html + "<p>Maximum number of answers:<input type=text value='"+params.maxAnswers+"' name=maxAnswers size=2>";
-        html = html + "<p>Required:";
-        html = html+ this.makeRadio('required',[{text:'Yes',value:1},{text:'No',value:0}],params.required);
-        html = html + "\
-                    </form>\
-                </div>\
-            </div>\
-        ";
-
-        document.getElementById('edit').innerHTML = html;
-
-
-        var butts = [ { text:"Submit", handler:function(){this.submit();}, isDefault:true }, { text:"Cancel", handler:function(){this.cancel();}} ];
-        if(params.Survey_questionId != ''){
-            butts[2] = {text:"Delete", handler:function(){Survey.Comm.deleteQuestion(params.Survey_questionId);}};
-        }
-
-        var form = new YAHOO.widget.Dialog("question", 
-            { width : "500px",
-              fixedcenter : true,
-              visible : false, 
-              constraintoviewport : true,
-              buttons : butts
-             } ); 
-
-        form.callback = Survey.Comm.callback;
-        form.render();
-        form.show();
-
-    }
-    this.makeMenu = function(name,values,text,selected){
-        var html = "<select name='"+name+"'>\n";
-        for(var i in values){
-            if(values[i] == selected){
-                html = html + "<option value='"+values[i]+"' selected>"+text[i]+"</option>\n";
-            }else{
-                html = html + "<option value='"+values[i]+"' >"+text[i]+"</option>\n";
-            }
-        }
-        html = html + "</select>\n";
-        return html;
-    }
-    this.makeRadio = function(name,values,checked){
-        var html = '';
-        for(var i in values){
-            if(checked == values[i]['value']){
-                html = html+ "<input type='radio' id='"+name+"' name='" + name + "' value='" + values[i]['value'] + "' checked>" + values[i]['text'];
-            }else{
-                html = html+ "<input type='radio' id='"+name+"' name='" + name + "' value='" + values[i]['value'] + "' >" + values[i]['text'];
-            }
-        }
-        html = html + "\n";
-        return html;
-    }
-
-}();
diff --git a/www/extras/wobject/Survey/editsurvey/section.js b/www/extras/wobject/Survey/editsurvey/section.js
deleted file mode 100644
index 91d21a00a..000000000
--- a/www/extras/wobject/Survey/editsurvey/section.js
+++ /dev/null
@@ -1,28 +0,0 @@
-if (typeof Survey == "undefined") {
-    var Survey = {};
-}
-
-Survey.SectionTemplate = new function(){
-
-    this.loadSection = function(html){
-
-        document.getElementById('edit').innerHTML = html;
-
-        var butts = [ { text:"Submit", handler:function(){this.submit();}, isDefault:true }, { text:"Cancel", handler:function(){this.cancel();}}, 
-                {text:"Delete", handler:function(){document.getElementById('delete').setValue(1); this.submit();}}
-            ];
-
-        var form = new YAHOO.widget.Dialog("section",
-           { width : "500px",
-             fixedcenter : true,
-             visible : false,
-             constraintoviewport : true,
-             buttons : butts
-           } );
-
-        form.callback = Survey.Comm.callback;
-        form.render();
-        form.show();
-    }
-}();
-