diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 2d41591cc..28f24448a 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2085,7 +2085,6 @@ define([
                 AppConfig.registeredOnlyTypes.indexOf(p) !== -1) { return; }
             return true;
         });
-        Messages.type.form = "Form"; // XXX
         types.forEach(function (p) {
             var $element = $('<li>', {
                 'class': 'cp-icons-element',
diff --git a/www/common/inner/share.js b/www/common/inner/share.js
index 5db88b672..9ba75f867 100644
--- a/www/common/inner/share.js
+++ b/www/common/inner/share.js
@@ -502,9 +502,6 @@ define([
 
         var auditor;
         if (isForm) {
-            Messages.share_formEdit = "Author"; // XXX
-            Messages.share_formView = "Participant"; // XXX
-            Messages.share_formAuditor = "Auditor"; // XXX
             labelEdit = Messages.share_formEdit;
             labelView = Messages.share_formView;
             auditor = UI.createRadio('accessRights', 'cp-share-form', Messages.share_formAuditor, false, {
diff --git a/www/form/inner.js b/www/form/inner.js
index fda6bbf38..2e6564465 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -76,109 +76,6 @@ define([
         timeFormat = "h:i K";
     }
 
-    Messages.button_newform = "New Form"; // XXX
-    Messages.form_invalid = "Invalid form";
-    Messages.form_editBlock = "Edit";
-    Messages.form_editMax = "Max selectable options";
-    Messages.form_editMaxLength = "Maximum characters";
-    Messages.form_editType = "Options type";
-
-    Messages.form_poll_text = "Text";
-    Messages.form_poll_day = "Day";
-    Messages.form_poll_time = "Time";
-    Messages.form_poll_switch = "Switch axes" // XXX DB
-    Messages.form_pollTotal = "Total";
-
-    Messages.form_pollYourAnswers = "Your answers";
-
-    Messages.form_textType = "Text type";
-    Messages.form_text_text = "Text";
-    Messages.form_text_url = "URL";
-    Messages.form_text_email = "Email";
-    Messages.form_text_number = "Number";
-    Messages.form_input_ph_url = "Enter a URL here";
-    Messages.form_input_ph_email = "Email address";
-
-    Messages.form_default = "Your question here?";
-    Messages.form_type_input = "Text"; // XXX
-    Messages.form_type_textarea = "Textarea"; // XXX
-    Messages.form_type_radio = "Radio"; // XXX
-    Messages.form_type_multiradio = "Multiline Radio"; // XXX
-    Messages.form_type_checkbox = "Checkbox"; // XXX
-    Messages.form_type_multicheck = "Multiline Checkbox"; // XXX
-    Messages.form_type_poll = "Poll"; // XXX
-    Messages.form_type_sort = "Ordered list"; // XXX
-    Messages.form_sort_hint = "Please drag these items from most (1) to least ({0}) preferred.";
-
-    Messages.form_type_md = "Description"; // XXX
-    Messages.form_type_page = "Page break"; // XXX
-
-    Messages.form_description_default = "Your text here";
-
-    Messages.form_duplicates = "Duplicate entries have been removed";
-    Messages.form_maxOptions = "{0} answer(s) max";
-    Messages.form_maxLength = "Characters limit: {0}/{1}";
-
-    Messages.form_submit = "Submit";
-    Messages.form_update = "Update";
-    Messages.form_submitWarning = "Submit anyway";
-    Messages.form_updateWarning  = "Update anyway";
-    Messages.form_reset = "Reset";
-    Messages.form_sent = "Sent";
-    Messages.form_delete = "Delete";
-    Messages.form_invalidWarning = "There are errors in some answers:";
-    Messages.form_invalidQuestion = "Question {0}";
-
-    Messages.form_cantFindAnswers = "Unable to retrieve your existing answers for this form.";
-    Messages.form_answered = "You already answered this form";
-
-    Messages.form_results = "Responses";
-    Messages.form_results_empty = "There are no responses";
-    Messages.form_editor = "Editor";
-    Messages.form_form = "Form";
-    Messages.form_viewResults = "Go to responses";
-    Messages.form_viewCreator = "Go to form creator";
-    Messages.form_showIndividual = "Show individual answers";
-    Messages.form_showSummary = "Show summary";
-    Messages.form_answerAnonymous = "Anonymous answer on <em>{0}</em>";
-    Messages.form_viewButton = "View";
-    Messages.form_backButton = "Back";
-    Messages.form_answerName = "Answer from {0} on <em>{1}</em>";
-    Messages.form_answerWarning = "Unconfirmed identity";
-
-    Messages.form_notAnswered = "And <b>{0}</b> empty answers";
-
-    Messages.form_makePublic = "Publish results";
-    Messages.form_makePublicWarning = "Are you sure you want to make the results of this form public? This can't be undone.";
-    Messages.form_isPublic = "Results are public";
-    Messages.form_isPrivate = "Results are private";
-
-    Messages.form_open = "Open";
-    Messages.form_setEnd = "Set closing date";
-    Messages.form_removeEnd = "Remove closing date";
-    Messages.form_isOpen = "This form is open";
-    Messages.form_isClosed = "This form was closed on {0}";
-    Messages.form_willClose = "This form will close on {0}";
-
-    Messages.form_anonymous = "Anonymous answers";
-    Messages.form_anonymous_on = "Allowed";
-    Messages.form_anonymous_off = "Blocked";
-    Messages.form_anonymous_blocked = "Anonymous responses are blocked for this form. You must log in or register to submit answers.";
-
-    Messages.form_defaultOption = "Option {0}";
-    Messages.form_defaultItem = "Item {0}";
-    Messages.form_newOption = "New option";
-    Messages.form_newItem = "New item";
-    Messages.form_add_option = "Add option";
-    Messages.form_add_item = "Add item";
-    Messages.form_addMultiple = "Add all";
-    Messages.form_addMultipleHint = "Add multiple dates and times"
-    Messages.form_clear = "Clear";
-
-    Messages.form_page = "Page {0}/{1}";
-
-    Messages.form_anonymousBox = "Answer anonymously";
-
     var MAX_OPTIONS = 15; // XXX
     var MAX_ITEMS = 10; // XXX