diff --git a/mindplot/src/main/javascript/MultilineTextEditor.js b/mindplot/src/main/javascript/MultilineTextEditor.js
index dfa95411..5279a71f 100644
--- a/mindplot/src/main/javascript/MultilineTextEditor.js
+++ b/mindplot/src/main/javascript/MultilineTextEditor.js
@@ -149,8 +149,6 @@ mindplot.MultilineTextEditor = new Class({
 
         if (this._topic.getText() != this._getText()) {
             var text = this._getText();
-            // Do not send windows return chars ...
-            text = text.replace("\r","");
             var topicId = this._topic.getId();
 
             var actionDispatcher = mindplot.ActionDispatcher.getInstance();
diff --git a/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js b/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js
index 2e802b59..39a0b217 100644
--- a/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js
+++ b/mindplot/src/main/javascript/persistence/XMLSerializer_Pela.js
@@ -18,7 +18,7 @@
 
 mindplot.persistence.XMLSerializer_Pela = new Class({
 
-    toXML:function (mindmap) {
+    toXML: function (mindmap) {
         $assert(mindmap, "Can not save a null mindmap");
 
         var document = core.Utils.createDocument();
@@ -27,7 +27,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         var mapElem = document.createElement("map");
         var name = mindmap.getId();
         if ($defined(name)) {
-            mapElem.setAttribute('name', name);
+            mapElem.setAttribute('name', this.rmXmlInv(name));
         }
         var version = mindmap.getVersion();
         if ($defined(version)) {
@@ -61,7 +61,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return document;
     },
 
-    _topicToXML:function (document, topic) {
+    _topicToXML: function (document, topic) {
         var parentTopic = document.createElement("topic");
 
         // Set topic attributes...
@@ -150,9 +150,9 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
                 var value = attributes[key];
                 if (key == 'text') {
                     var cdata = document.createCDATASection(value);
-                    featureDom.appendChild(cdata);
+                    featureDom.appendChild(this.rmXmlInv(cdata));
                 } else {
-                    featureDom.setAttribute(key, value);
+                    featureDom.setAttribute(key, this.rmXmlInv(value));
                 }
             }
             parentTopic.appendChild(featureDom);
@@ -169,18 +169,18 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return parentTopic;
     },
 
-    _noteTextToXML:function (document, elem, text) {
+    _noteTextToXML: function (document, elem, text) {
         if (text.indexOf('\n') == -1) {
-            elem.setAttribute('text', text);
+            elem.setAttribute('text', this.rmXmlInv(text));
         } else {
             var textDom = document.createElement("text");
-            var cdata = document.createCDATASection(text);
+            var cdata = document.createCDATASection(this.rmXmlInv(text));
             textDom.appendChild(cdata);
             elem.appendChild(textDom);
         }
     },
 
-    _relationshipToXML:function (document, relationship) {
+    _relationshipToXML: function (document, relationship) {
         var result = document.createElement("relationship");
         result.setAttribute("srcTopicId", relationship.getFromNode());
         result.setAttribute("destTopicId", relationship.getToNode());
@@ -203,7 +203,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return result;
     },
 
-    loadFromDom:function (dom, mapId) {
+    loadFromDom: function (dom, mapId) {
         $assert(dom, "dom can not be null");
         $assert(mapId, "mapId can not be null");
 
@@ -239,7 +239,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return mindmap;
     },
 
-    _deserializeNode:function (domElem, mindmap) {
+    _deserializeNode: function (domElem, mindmap) {
         var type = (domElem.getAttribute('central') != null) ? mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE : mindplot.model.INodeModel.MAIN_TOPIC_TYPE;
 
         // Load attributes...
@@ -320,7 +320,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
 
         var isShrink = domElem.getAttribute('shrink');
         // Hack: Some production maps has been stored with the central topic collapsed. This is a bug.
-        if ($defined(isShrink) && type!=mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
+        if ($defined(isShrink) && type != mindplot.model.INodeModel.CENTRAL_TOPIC_TYPE) {
             topic.setChildrenShrunken(isShrink);
         }
 
@@ -373,7 +373,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return topic;
     },
 
-    _deserializeTextAttr:function (domElem) {
+    _deserializeTextAttr: function (domElem) {
         var value = domElem.getAttribute("text");
         if (!$defined(value)) {
             var children = domElem.childNodes;
@@ -396,7 +396,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return value;
     },
 
-    _deserializeNodeText:function (domElem) {
+    _deserializeNodeText: function (domElem) {
         var children = domElem.childNodes;
         var value = null;
         for (var i = 0; i < children.length; i++) {
@@ -408,7 +408,7 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         return value;
     },
 
-    _deserializeRelationship:function (domElement, mindmap) {
+    _deserializeRelationship: function (domElement, mindmap) {
         var srcId = domElement.getAttribute("srcTopicId");
         var destId = domElement.getAttribute("destTopicId");
         var lineType = domElement.getAttribute("lineType");
@@ -437,6 +437,36 @@ mindplot.persistence.XMLSerializer_Pela = new Class({
         model.setStartArrow('true');
         return model;
     }
+    /*
+     * This method ensures that the output String has only
+     * valid XML unicode characters as specified by the
+     * XML 1.0 standard. For reference, please see
+     * <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char">the
+     * standard</a>. This method will return an empty
+     * String if the input is null or empty.
+     *
+     * @param in The String whose non-valid characters we want to remove.
+     * @return The in String, stripped of non-valid characters.
+     */,
+    rmXmlInv: function (str) {
+
+        if (str == null || str == undefined)
+            return null;
+
+        var result = "";
+        for (var i=0;i<str.length;i++){
+            var c = str.charCodeAt(i);
+            if ((c == 0x9) || (c == 0xA) || (c == 0xD)
+                || ((c >= 0x20) && (c <= 0xD7FF))
+                || ((c >= 0xE000) && (c <= 0xFFFD))
+                || ((c >= 0x10000) && (c <= 0x10FFFF))) {
+                result = result + str.charAt(i);
+            }
+
+        }
+        return result;
+
+    }
 });
 
 mindplot.persistence.XMLSerializer_Pela.MAP_ROOT_NODE = 'map';
\ No newline at end of file
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 9deb25d2..b0e60a07 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -181,7 +181,6 @@ public class MindmapController extends BaseController {
         final Mindmap mindmap = mindmapService.findMindmapById(id);
 
         String xmlStr = mindmap.getXmlStr();
-        xmlStr = xmlStr.replace('\r',' '); // This is a temporal hack. Remove in 2014 ... :)
         return xmlStr.getBytes("UTF-8");
     }
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
index 6c2f2bcd..636b6243 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
@@ -75,12 +75,6 @@
         <put-attribute name="removeSignin" value="true"/>
     </definition>
 
-    <definition name="openidlogin" extends="pageTemplate">
-        <put-attribute name="title" value="LOGIN"/>
-        <put-attribute name="body" value="/jsp/openidlogin.jsp"/>
-        <put-attribute name="removeSignin" value="true"/>
-    </definition>
-
     <definition name="termsOfUse" extends="pageTemplate">
         <put-attribute name="title" value="TERM_OF_USE"/>
         <put-attribute name="body" value="/jsp/termsOfUse.jsp"/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index 636296af..b40b7f2d 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -50,26 +50,26 @@
                         authentication-failure-url="/c/login?login_error=2"
                         login-processing-url="/c/j_spring_security_check"/>
 
-        <sec:openid-login user-service-ref="userDetailsService"
-                          authentication-failure-url="/c/login.jsp?login_error=true"
-                          login-processing-url="/c/j_spring_openid_security_check">
+        <!--<sec:openid-login user-service-ref="userDetailsService"-->
+                          <!--authentication-failure-url="/c/login.jsp?login_error=true"-->
+                          <!--login-processing-url="/c/j_spring_openid_security_check">-->
 
-            <sec:attribute-exchange identifier-match="https://www.google.com/.*">
-                <sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true" count="1"/>
-                <sec:openid-attribute name="firstname" type="http://axschema.org/namePerson/first" required="true"/>
-                <sec:openid-attribute name="lastname" type="http://axschema.org/namePerson/last" required="true"/>
-            </sec:attribute-exchange>
+            <!--<sec:attribute-exchange identifier-match="https://www.google.com/.*">-->
+                <!--<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true" count="1"/>-->
+                <!--<sec:openid-attribute name="firstname" type="http://axschema.org/namePerson/first" required="true"/>-->
+                <!--<sec:openid-attribute name="lastname" type="http://axschema.org/namePerson/last" required="true"/>-->
+            <!--</sec:attribute-exchange>-->
 
-            <sec:attribute-exchange identifier-match=".*yahoo.com.*">
-                <sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>
-                <sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>
-            </sec:attribute-exchange>
+            <!--<sec:attribute-exchange identifier-match=".*yahoo.com.*">-->
+                <!--<sec:openid-attribute name="email" type="http://axschema.org/contact/email" required="true"/>-->
+                <!--<sec:openid-attribute name="fullname" type="http://axschema.org/namePerson" required="true"/>-->
+            <!--</sec:attribute-exchange>-->
 
-            <sec:attribute-exchange identifier-match=".*myopenid.com.*">
-                <sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>
-                <sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>
-            </sec:attribute-exchange>
-        </sec:openid-login>
+            <!--<sec:attribute-exchange identifier-match=".*myopenid.com.*">-->
+                <!--<sec:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true"/>-->
+                <!--<sec:openid-attribute name="fullname" type="http://schema.openid.net/namePerson" required="true"/>-->
+            <!--</sec:attribute-exchange>-->
+        <!--</sec:openid-login>-->
         <sec:remember-me key="wisemapping-hashed-key"/>
         <sec:logout logout-url="/c/logout" invalidate-session="true" logout-success-url="/c/login"/>
     </sec:http>
diff --git a/wise-webapp/src/main/webapp/css/openid.css b/wise-webapp/src/main/webapp/css/openid.css
deleted file mode 100644
index 8929ff07..00000000
--- a/wise-webapp/src/main/webapp/css/openid.css
+++ /dev/null
@@ -1,45 +0,0 @@
-#openid_form {
-	width: 580px;	
-}
-	#openid_form legend {
-		font-weight: bold;
-	}
-#openid_choice {
-	display: none;
-}
-#openid_input_area {
-	clear: both;
-	padding: 10px;
-}
-#openid_btns, #openid_btns br {
-	clear: both;
-}
-	#openid_highlight {
-		padding: 3px;
-		background-color: #FFFCC9;
-		float: left;
-	}
-	.openid_large_btn {
-		width: 100px;
-		height: 60px;
-		border: 1px solid #DDD;
-		margin: 3px;
-		float: left;
-	}
-	.openid_small_btn {
-		width: 24px;
-		height: 24px;
-		border: 1px solid #DDD;
-		margin: 3px;
-		float: left;
-	}	
-	a.openid_large_btn:focus {
-		outline: none;
-	}
-	a.openid_large_btn:focus
-	{
-	-moz-outline-style: none;
-	}
-	.openid_selected {
-		border: 4px solid #DDD;
-	}	
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/images.large/aol.gif b/wise-webapp/src/main/webapp/images.large/aol.gif
deleted file mode 100644
index decc4f12..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/aol.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/facebook.gif b/wise-webapp/src/main/webapp/images.large/facebook.gif
deleted file mode 100644
index b997b358..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/facebook.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/google.gif b/wise-webapp/src/main/webapp/images.large/google.gif
deleted file mode 100644
index 1b6cd07b..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/google.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/mailru.gif b/wise-webapp/src/main/webapp/images.large/mailru.gif
deleted file mode 100644
index 62fe79ed..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/mailru.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/myopenid.gif b/wise-webapp/src/main/webapp/images.large/myopenid.gif
deleted file mode 100644
index 4885a6dd..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/myopenid.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/openid.gif b/wise-webapp/src/main/webapp/images.large/openid.gif
deleted file mode 100644
index c718b0e6..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/openid.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/rambler.gif b/wise-webapp/src/main/webapp/images.large/rambler.gif
deleted file mode 100644
index f311e6fe..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/rambler.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/verisign.gif b/wise-webapp/src/main/webapp/images.large/verisign.gif
deleted file mode 100644
index faa6aaaf..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/verisign.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/vkontakte.gif b/wise-webapp/src/main/webapp/images.large/vkontakte.gif
deleted file mode 100644
index afb5c338..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/vkontakte.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/yahoo.gif b/wise-webapp/src/main/webapp/images.large/yahoo.gif
deleted file mode 100644
index 42adbfa5..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/yahoo.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.large/yandex.gif b/wise-webapp/src/main/webapp/images.large/yandex.gif
deleted file mode 100644
index ffb36723..00000000
Binary files a/wise-webapp/src/main/webapp/images.large/yandex.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/aol.ico b/wise-webapp/src/main/webapp/images.small/aol.ico
deleted file mode 100644
index f599e0b9..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/aol.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/aol.ico.gif b/wise-webapp/src/main/webapp/images.small/aol.ico.gif
deleted file mode 100644
index 7ba24cc9..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/aol.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/aol.ico.png b/wise-webapp/src/main/webapp/images.small/aol.ico.png
deleted file mode 100644
index d8984a2c..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/aol.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/blogger.ico b/wise-webapp/src/main/webapp/images.small/blogger.ico
deleted file mode 100644
index 1b9730b0..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/blogger.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/blogger.ico.gif b/wise-webapp/src/main/webapp/images.small/blogger.ico.gif
deleted file mode 100644
index 7e9be595..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/blogger.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/blogger.ico.png b/wise-webapp/src/main/webapp/images.small/blogger.ico.png
deleted file mode 100644
index 4a53a1a5..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/blogger.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/claimid.ico b/wise-webapp/src/main/webapp/images.small/claimid.ico
deleted file mode 100644
index 2b80f491..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/claimid.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/claimid.ico.gif b/wise-webapp/src/main/webapp/images.small/claimid.ico.gif
deleted file mode 100644
index 8a57d79a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/claimid.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/claimid.ico.png b/wise-webapp/src/main/webapp/images.small/claimid.ico.png
deleted file mode 100644
index a0086c32..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/claimid.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/clickpass.ico b/wise-webapp/src/main/webapp/images.small/clickpass.ico
deleted file mode 100644
index a97a2e59..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/clickpass.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/clickpass.ico.gif b/wise-webapp/src/main/webapp/images.small/clickpass.ico.gif
deleted file mode 100644
index 05e27f47..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/clickpass.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/clickpass.ico.png b/wise-webapp/src/main/webapp/images.small/clickpass.ico.png
deleted file mode 100644
index 6fd06059..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/clickpass.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/facebook.ico b/wise-webapp/src/main/webapp/images.small/facebook.ico
deleted file mode 100644
index de63d7f3..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/facebook.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/facebook.ico.gif b/wise-webapp/src/main/webapp/images.small/facebook.ico.gif
deleted file mode 100644
index 848ff1eb..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/facebook.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/facebook.ico.png b/wise-webapp/src/main/webapp/images.small/facebook.ico.png
deleted file mode 100644
index 800bce7e..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/facebook.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/flickr.ico b/wise-webapp/src/main/webapp/images.small/flickr.ico
deleted file mode 100644
index 11f6e07f..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/flickr.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/flickr.ico.gif b/wise-webapp/src/main/webapp/images.small/flickr.ico.gif
deleted file mode 100644
index 5967b2c1..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/flickr.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/flickr.ico.png b/wise-webapp/src/main/webapp/images.small/flickr.ico.png
deleted file mode 100644
index cdb4a249..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/flickr.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google.ico b/wise-webapp/src/main/webapp/images.small/google.ico
deleted file mode 100644
index ee7c943a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google.ico.gif b/wise-webapp/src/main/webapp/images.small/google.ico.gif
deleted file mode 100644
index 3b6b9be6..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google.ico.png b/wise-webapp/src/main/webapp/images.small/google.ico.png
deleted file mode 100644
index 31dd03db..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google_profile.ico b/wise-webapp/src/main/webapp/images.small/google_profile.ico
deleted file mode 100644
index ee7c943a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google_profile.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google_profile.ico.gif b/wise-webapp/src/main/webapp/images.small/google_profile.ico.gif
deleted file mode 100644
index 3b6b9be6..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google_profile.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/google_profile.ico.png b/wise-webapp/src/main/webapp/images.small/google_profile.ico.png
deleted file mode 100644
index 820c1ea2..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/google_profile.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/launchpad.ico b/wise-webapp/src/main/webapp/images.small/launchpad.ico
deleted file mode 100644
index 7db6e67f..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/launchpad.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/launchpad.ico.gif b/wise-webapp/src/main/webapp/images.small/launchpad.ico.gif
deleted file mode 100644
index 51192da6..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/launchpad.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/launchpad.ico.png b/wise-webapp/src/main/webapp/images.small/launchpad.ico.png
deleted file mode 100644
index 1f43d33e..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/launchpad.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/linkedin.ico b/wise-webapp/src/main/webapp/images.small/linkedin.ico
deleted file mode 100644
index 7f267aa3..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/linkedin.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/linkedin.ico.gif b/wise-webapp/src/main/webapp/images.small/linkedin.ico.gif
deleted file mode 100644
index b25477a3..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/linkedin.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/linkedin.ico.png b/wise-webapp/src/main/webapp/images.small/linkedin.ico.png
deleted file mode 100644
index a8800bad..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/linkedin.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/livejournal.ico b/wise-webapp/src/main/webapp/images.small/livejournal.ico
deleted file mode 100644
index f3d21ec5..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/livejournal.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/livejournal.ico.gif b/wise-webapp/src/main/webapp/images.small/livejournal.ico.gif
deleted file mode 100644
index 8897eb25..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/livejournal.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/livejournal.ico.png b/wise-webapp/src/main/webapp/images.small/livejournal.ico.png
deleted file mode 100644
index ff703a28..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/livejournal.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/mailru.ico b/wise-webapp/src/main/webapp/images.small/mailru.ico
deleted file mode 100644
index 0694727e..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/mailru.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/mailru.ico.gif b/wise-webapp/src/main/webapp/images.small/mailru.ico.gif
deleted file mode 100644
index 2f449a5f..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/mailru.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/mailru.ico.png b/wise-webapp/src/main/webapp/images.small/mailru.ico.png
deleted file mode 100644
index 49b21cda..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/mailru.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/myopenid.ico b/wise-webapp/src/main/webapp/images.small/myopenid.ico
deleted file mode 100644
index ceb06e6a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/myopenid.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/myopenid.ico.gif b/wise-webapp/src/main/webapp/images.small/myopenid.ico.gif
deleted file mode 100644
index 5f0af22e..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/myopenid.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/myopenid.ico.png b/wise-webapp/src/main/webapp/images.small/myopenid.ico.png
deleted file mode 100644
index 9b96dc25..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/myopenid.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/openid.ico b/wise-webapp/src/main/webapp/images.small/openid.ico
deleted file mode 100644
index 982b4433..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/openid.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/openid.ico.gif b/wise-webapp/src/main/webapp/images.small/openid.ico.gif
deleted file mode 100644
index d925305c..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/openid.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/openid.ico.png b/wise-webapp/src/main/webapp/images.small/openid.ico.png
deleted file mode 100644
index 6040e923..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/openid.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/rambler.ico b/wise-webapp/src/main/webapp/images.small/rambler.ico
deleted file mode 100644
index 6b9f7870..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/rambler.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/rambler.ico.gif b/wise-webapp/src/main/webapp/images.small/rambler.ico.gif
deleted file mode 100644
index 2d5064bb..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/rambler.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/rambler.ico.png b/wise-webapp/src/main/webapp/images.small/rambler.ico.png
deleted file mode 100644
index 39efc927..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/rambler.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/technorati.ico b/wise-webapp/src/main/webapp/images.small/technorati.ico
deleted file mode 100644
index fa1083c1..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/technorati.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/technorati.ico.gif b/wise-webapp/src/main/webapp/images.small/technorati.ico.gif
deleted file mode 100644
index 290c894f..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/technorati.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/technorati.ico.png b/wise-webapp/src/main/webapp/images.small/technorati.ico.png
deleted file mode 100644
index 9019c1fd..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/technorati.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/twitter.ico b/wise-webapp/src/main/webapp/images.small/twitter.ico
deleted file mode 100644
index 92336ff0..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/twitter.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/twitter.ico.gif b/wise-webapp/src/main/webapp/images.small/twitter.ico.gif
deleted file mode 100644
index a6a018e3..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/twitter.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/twitter.ico.png b/wise-webapp/src/main/webapp/images.small/twitter.ico.png
deleted file mode 100644
index c3227e7c..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/twitter.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/verisign.ico b/wise-webapp/src/main/webapp/images.small/verisign.ico
deleted file mode 100644
index 3953af93..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/verisign.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/verisign.ico.gif b/wise-webapp/src/main/webapp/images.small/verisign.ico.gif
deleted file mode 100644
index 6a770720..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/verisign.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/verisign.ico.png b/wise-webapp/src/main/webapp/images.small/verisign.ico.png
deleted file mode 100644
index 04869b2a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/verisign.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vidoop.ico b/wise-webapp/src/main/webapp/images.small/vidoop.ico
deleted file mode 100644
index bbd9a0d5..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vidoop.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vidoop.ico.gif b/wise-webapp/src/main/webapp/images.small/vidoop.ico.gif
deleted file mode 100644
index 0a16de3d..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vidoop.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vidoop.ico.png b/wise-webapp/src/main/webapp/images.small/vidoop.ico.png
deleted file mode 100644
index 30e486ee..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vidoop.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vkontakte.ico b/wise-webapp/src/main/webapp/images.small/vkontakte.ico
deleted file mode 100644
index c1e4428b..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vkontakte.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vkontakte.ico.gif b/wise-webapp/src/main/webapp/images.small/vkontakte.ico.gif
deleted file mode 100644
index c360eb1c..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vkontakte.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/vkontakte.ico.png b/wise-webapp/src/main/webapp/images.small/vkontakte.ico.png
deleted file mode 100644
index 06f19b2b..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/vkontakte.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/winliveid.ico b/wise-webapp/src/main/webapp/images.small/winliveid.ico
deleted file mode 100644
index 4744dae8..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/winliveid.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/winliveid.ico.gif b/wise-webapp/src/main/webapp/images.small/winliveid.ico.gif
deleted file mode 100644
index a6eba9af..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/winliveid.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/winliveid.ico.png b/wise-webapp/src/main/webapp/images.small/winliveid.ico.png
deleted file mode 100644
index 38fab9f0..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/winliveid.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/wordpress.ico b/wise-webapp/src/main/webapp/images.small/wordpress.ico
deleted file mode 100644
index 31b7d2c2..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/wordpress.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/wordpress.ico.gif b/wise-webapp/src/main/webapp/images.small/wordpress.ico.gif
deleted file mode 100644
index b4f3beb4..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/wordpress.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/wordpress.ico.png b/wise-webapp/src/main/webapp/images.small/wordpress.ico.png
deleted file mode 100644
index 7242e383..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/wordpress.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yahoo.ico b/wise-webapp/src/main/webapp/images.small/yahoo.ico
deleted file mode 100644
index d7761e5a..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yahoo.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yahoo.ico.gif b/wise-webapp/src/main/webapp/images.small/yahoo.ico.gif
deleted file mode 100644
index 32d27c19..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yahoo.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yahoo.ico.png b/wise-webapp/src/main/webapp/images.small/yahoo.ico.png
deleted file mode 100644
index 1475eca0..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yahoo.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yandex.ico b/wise-webapp/src/main/webapp/images.small/yandex.ico
deleted file mode 100644
index e7821975..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yandex.ico and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yandex.ico.gif b/wise-webapp/src/main/webapp/images.small/yandex.ico.gif
deleted file mode 100644
index 6b1e30e3..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yandex.ico.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images.small/yandex.ico.png b/wise-webapp/src/main/webapp/images.small/yandex.ico.png
deleted file mode 100644
index e09f1d99..00000000
Binary files a/wise-webapp/src/main/webapp/images.small/yandex.ico.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/openid-inputicon.gif b/wise-webapp/src/main/webapp/images/openid-inputicon.gif
deleted file mode 100644
index cde836c8..00000000
Binary files a/wise-webapp/src/main/webapp/images/openid-inputicon.gif and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/openid-providers-en.png b/wise-webapp/src/main/webapp/images/openid-providers-en.png
deleted file mode 100644
index f5fd7288..00000000
Binary files a/wise-webapp/src/main/webapp/images/openid-providers-en.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/images/openid-providers-ru.png b/wise-webapp/src/main/webapp/images/openid-providers-ru.png
deleted file mode 100644
index a1750caf..00000000
Binary files a/wise-webapp/src/main/webapp/images/openid-providers-ru.png and /dev/null differ
diff --git a/wise-webapp/src/main/webapp/js/openid-en.js b/wise-webapp/src/main/webapp/js/openid-en.js
deleted file mode 100644
index 2b68c665..00000000
--- a/wise-webapp/src/main/webapp/js/openid-en.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-	Simple OpenID Plugin
-	http://code.google.com/p/openid-selector/
-	
-	This code is licensed under the New BSD License.
-*/
-
-var providers_large = {
-	google : {
-		name : 'Google',
-		url : 'https://www.google.com/accounts/o8/id'
-	},
-	yahoo : {
-		name : 'Yahoo',
-		url : 'http://me.yahoo.com/'
-	},
-	aol : {
-		name : 'AOL',
-		label : 'Enter your AOL screenname.',
-		url : 'http://openid.aol.com/{username}'
-	},
-	myopenid : {
-		name : 'MyOpenID',
-		label : 'Enter your MyOpenID username.',
-		url : 'http://{username}.myopenid.com/'
-	},
-	openid : {
-		name : 'OpenID',
-		label : 'Enter your OpenID.',
-		url : null
-	}
-};
-
-var providers_small = {
-	livejournal : {
-		name : 'LiveJournal',
-		label : 'Enter your Livejournal username.',
-		url : 'http://{username}.livejournal.com/'
-	},
-	/* flickr: {
-		name: 'Flickr',        
-		label: 'Enter your Flickr username.',
-		url: 'http://flickr.com/{username}/'
-	}, */
-	/* technorati: {
-		name: 'Technorati',
-		label: 'Enter your Technorati username.',
-		url: 'http://technorati.com/people/technorati/{username}/'
-	}, */
-	wordpress : {
-		name : 'Wordpress',
-		label : 'Enter your Wordpress.com username.',
-		url : 'http://{username}.wordpress.com/'
-	},
-	blogger : {
-		name : 'Blogger',
-		label : 'Your Blogger account',
-		url : 'http://{username}.blogspot.com/'
-	},
-	verisign : {
-		name : 'Verisign',
-		label : 'Your Verisign username',
-		url : 'http://{username}.pip.verisignlabs.com/'
-	},
-	/* vidoop: {
-		name: 'Vidoop',
-		label: 'Your Vidoop username',
-		url: 'http://{username}.myvidoop.com/'
-	}, */
-	/* launchpad: {
-		name: 'Launchpad',
-		label: 'Your Launchpad username',
-		url: 'https://launchpad.net/~{username}'
-	}, */
-	claimid : {
-		name : 'ClaimID',
-		label : 'Your ClaimID username',
-		url : 'http://claimid.com/{username}'
-	},
-	clickpass : {
-		name : 'ClickPass',
-		label : 'Enter your ClickPass username',
-		url : 'http://clickpass.com/public/{username}'
-	},
-	google_profile : {
-		name : 'Google Profile',
-		label : 'Enter your Google Profile username',
-		url : 'http://www.google.com/profiles/{username}'
-	}
-};
-
-openid.locale = 'en';
-openid.sprite = 'en'; // reused in german& japan localization
-openid.demo_text = 'In client demo mode. Normally would have submitted OpenID:';
-openid.signin_text = 'Sign-In';
-openid.image_title = 'log in with {provider}';
diff --git a/wise-webapp/src/main/webapp/js/openid-jquery.js b/wise-webapp/src/main/webapp/js/openid-jquery.js
deleted file mode 100644
index 0c98366b..00000000
--- a/wise-webapp/src/main/webapp/js/openid-jquery.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-	Simple OpenID Plugin
-	http://code.google.com/p/openid-selector/
-	
-	This code is licensed under the New BSD License.
-*/
-
-var providers;
-var openid;
-(function ($) {
-openid = {
-	version : '1.3', // version constant
-	demo : false,
-	demo_text : null,
-	cookie_expires : 6 * 30, // 6 months.
-	cookie_name : 'openid_provider',
-	cookie_path : '/',
-
-	img_path : 'images/',
-	locale : null, // is set in openid-<locale>.js
-	sprite : null, // usually equals to locale, is set in
-	// openid-<locale>.js
-	signin_text : null, // text on submit button on the form
-	all_small : false, // output large providers w/ small icons
-	no_sprite : false, // don't use sprite image
-	image_title : '{provider}', // for image title
-
-	input_id : null,
-	provider_url : null,
-	provider_id : null,
-
-	/**
-	 * Class constructor
-	 * 
-	 * @return {Void}
-	 */
-	init : function(input_id) {
-		providers = $.extend({}, providers_large, providers_small);
-		var openid_btns = $('#openid_btns');
-		this.input_id = input_id;
-		$('#openid_choice').show();
-		$('#openid_input_area').empty();
-		var i = 0;
-		// add box for each provider
-		for (id in providers_large) {
-			box = this.getBoxHTML(id, providers_large[id], (this.all_small ? 'small' : 'large'), i++);
-			openid_btns.append(box);
-		}
-		if (providers_small) {
-			openid_btns.append('<br/>');
-			for (id in providers_small) {
-				box = this.getBoxHTML(id, providers_small[id], 'small', i++);
-				openid_btns.append(box);
-			}
-		}
-		$('#openid_form').submit(this.submit);
-		var box_id = this.readCookie();
-		if (box_id) {
-			this.signin(box_id, true);
-		}
-	},
-
-	/**
-	 * @return {String}
-	 */
-	getBoxHTML : function(box_id, provider, box_size, index) {
-		if (this.no_sprite) {
-			var image_ext = box_size == 'small' ? '.ico.gif' : '.gif';
-			return '<a title="' + this.image_title.replace('{provider}', provider["name"]) + '" href="javascript:openid.signin(\'' + box_id + '\');"'
-					+ ' style="background: #FFF url(' + this.img_path + '../images.' + box_size + '/' + box_id + image_ext + ') no-repeat center center" '
-					+ 'class="' + box_id + ' openid_' + box_size + '_btn"></a>';
-		}
-		var x = box_size == 'small' ? -index * 24 : -index * 100;
-		var y = box_size == 'small' ? -60 : 0;
-		return '<a title="' + this.image_title.replace('{provider}', provider["name"]) + '" href="javascript:openid.signin(\'' + box_id + '\');"'
-				+ ' style="background: #FFF url(' + this.img_path + 'openid-providers-' + this.sprite + '.png); background-position: ' + x + 'px ' + y + 'px" '
-				+ 'class="' + box_id + ' openid_' + box_size + '_btn"></a>';
-	},
-
-	/**
-	 * Provider image click
-	 * 
-	 * @return {Void}
-	 */
-	signin : function(box_id, onload) {
-		var provider = providers[box_id];
-		if (!provider) {
-			return;
-		}
-		this.highlight(box_id);
-		this.setCookie(box_id);
-		this.provider_id = box_id;
-		this.provider_url = provider['url'];
-		// prompt user for input?
-		if (provider['label']) {
-			this.useInputBox(provider);
-		} else {
-			$('#openid_input_area').empty();
-			if (!onload) {
-				$('#openid_form').submit();
-			}
-		}
-	},
-
-	/**
-	 * Sign-in button click
-	 * 
-	 * @return {Boolean}
-	 */
-	submit : function() {
-		var url = openid.provider_url;
-		if (url) {
-			url = url.replace('{username}', $('#openid_username').val());
-			openid.setOpenIdUrl(url);
-		}
-		if (openid.demo) {
-			alert(openid.demo_text + "\r\n" + document.getElementById(openid.input_id).value);
-			return false;
-		}
-		if (url.indexOf("javascript:") == 0) {
-			url = url.substr("javascript:".length);
-			eval(url);
-			return false;
-		}
-		return true;
-	},
-
-	/**
-	 * @return {Void}
-	 */
-	setOpenIdUrl : function(url) {
-		var hidden = document.getElementById(this.input_id);
-		if (hidden != null) {
-			hidden.value = url;
-		} else {
-			$('#openid_form').append('<input type="hidden" id="' + this.input_id + '" name="' + this.input_id + '" value="' + url + '"/>');
-		}
-	},
-
-	/**
-	 * @return {Void}
-	 */
-	highlight : function(box_id) {
-		// remove previous highlight.
-		var highlight = $('#openid_highlight');
-		if (highlight) {
-			highlight.replaceWith($('#openid_highlight a')[0]);
-		}
-		// add new highlight.
-		$('.' + box_id).wrap('<div id="openid_highlight"></div>');
-	},
-
-	setCookie : function(value) {
-		var date = new Date();
-		date.setTime(date.getTime() + (this.cookie_expires * 24 * 60 * 60 * 1000));
-		var expires = "; expires=" + date.toGMTString();
-		document.cookie = this.cookie_name + "=" + value + expires + "; path=" + this.cookie_path;
-	},
-
-	readCookie : function() {
-		var nameEQ = this.cookie_name + "=";
-		var ca = document.cookie.split(';');
-		for ( var i = 0; i < ca.length; i++) {
-			var c = ca[i];
-			while (c.charAt(0) == ' ')
-				c = c.substring(1, c.length);
-			if (c.indexOf(nameEQ) == 0)
-				return c.substring(nameEQ.length, c.length);
-		}
-		return null;
-	},
-
-	/**
-	 * @return {Void}
-	 */
-	useInputBox : function(provider) {
-		var input_area = $('#openid_input_area');
-		var html = '';
-		var id = 'openid_username';
-		var value = '';
-		var label = provider['label'];
-		var style = '';
-		if (label) {
-			html = '<p>' + label + '</p>';
-		}
-		if (provider['name'] == 'OpenID') {
-			id = this.input_id;
-			value = 'http://';
-			style = 'background: #FFF url(' + this.img_path + 'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;';
-		}
-		html += '<input id="' + id + '" type="text" style="' + style + '" name="' + id + '" value="' + value + '" />'
-				+ '<input id="openid_submit" type="submit" value="' + this.signin_text + '"/>';
-		input_area.empty();
-		input_area.append(html);
-		$('#' + id).focus();
-	},
-
-	setDemoMode : function(demoMode) {
-		this.demo = demoMode;
-	}
-};
-})(jQuery);
diff --git a/wise-webapp/src/main/webapp/jsp/login.jsp b/wise-webapp/src/main/webapp/jsp/login.jsp
index 539ba572..1ba2adf1 100644
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -4,22 +4,6 @@
 <%--@elvariable id="isHsql" type="boolean"--%>
 
 <script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
-<script type="text/javascript" src="js/openid-jquery.js"></script>
-<script type="text/javascript" src="js/openid-en.js"></script>
-<script type="text/javascript">
-    $(document).ready(function() {
-        openid.init('openid_identifier');
-        openid.setDemoMode(true); //Stops form submission for client javascript-only test purposes
-    });
-</script>
-<!-- /Simple OpenID Selector -->
-<style type="text/css">
-        /* Basic page formatting */
-    body {
-        font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-</style>
-
 <script type="text/javascript" language="javascript">
     $(function () {
         $('#loginForm').submit(function () {
@@ -33,28 +17,6 @@
         <h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
         <spring:message code="WELCOME_DETAILS"/>
     </div>
-    <div class="span1">
-        <!-- Simple OpenID Selector -->
-        <form action="examples/consumer/try_auth.php" method="get" id="openid_form">
-            <input type="hidden" name="action" value="verify" />
-            <fieldset>
-                <legend>Sign-in or Create New Account</legend>
-                <div id="openid_choice">
-                    <p>Please click your account provider:</p>
-                    <div id="openid_btns"></div>
-                </div>
-                <div id="openid_input_area">
-                    <input id="openid_identifier" name="openid_identifier" type="text" value="http://" />
-                    <input id="openid_submit" type="submit" value="Sign-In"/>
-                </div>
-                <noscript>
-                    <p>OpenID is service that allows you to log-on to many different websites using a single indentity.
-                        Find out <a href="http://openid.net/what/">more about OpenID</a> and <a href="http://openid.net/get/">how to get an OpenID enabled account</a>.</p>
-                </noscript>
-            </fieldset>
-        </form>
-
-    </div>
     <div id="login" class="fform span6">
         <h1><spring:message code="SIGN_IN"/></h1>
 
diff --git a/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp b/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
deleted file mode 100644
index d1146fa9..00000000
--- a/wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core' %>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>OpenID Login</title>
-
-    <!-- Simple OpenID Selector -->
-    <link rel="stylesheet" href="<c:url value='/css/openid.css'/>" />
-    <script type="text/javascript" src="<c:url value='/js/jquery-1.2.6.min.js'/>"></script>
-    <script type="text/javascript" src="<c:url value='/js/openid-jquery.js'/>"></script>
-
-    <script type="text/javascript">
-    $(document).ready(function() {
-        openid.init('openid_identifier');
-     //   openid.setDemoMode(true); Stops form submission for client javascript-only test purposes
-    });
-    </script>
-    <!-- /Simple OpenID Selector -->
-
-    <style type="text/css">
-        /* Basic page formatting. */
-        body {
-            font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
-        }
-    </style>
-</head>
-
-<body>
-
-<c:if test="${not empty param.login_error}">
-  <font color="red">
-    Your login attempt was not successful, try again.<br/><br/>
-    Reason: <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>.
-  </font>
-</c:if>
-
-<!-- Simple OpenID Selector -->
-<form action="<c:url value='c/j_spring_openid_security_check'/>" method="post" id="openid_form">
-    <input type="hidden" name="action" value="verify" />
-
-    <fieldset>
-            <legend>Sign-in or Create New Account</legend>
-
-            <div id="openid_choice">
-                <p>Please click your account provider:</p>
-                <div id="openid_btns"></div>
-
-            </div>
-
-            <div id="openid_input_area">
-                <input id="openid_identifier" name="openid_identifier" type="text" value="http://" />
-                <input id="openid_submit" type="submit" value="Sign-In"/>
-            </div>
-            <noscript>
-            <p>OpenID is a service that allows you to log-on to many different websites using a single identity.
-            Find out <a href="http://openid.net/what/">more about OpenID</a> and <a href="http://openid.net/get/">how to get an OpenID enabled account</a>.</p>
-            </noscript>
-    </fieldset>
-</form>
-<!-- /Simple OpenID Selector -->
-
-</body>
-</html>
diff --git a/wise-webapp/src/main/webapp/jsp/openidlogin.jsp b/wise-webapp/src/main/webapp/jsp/openidlogin.jsp
deleted file mode 100644
index 38c24891..00000000
--- a/wise-webapp/src/main/webapp/jsp/openidlogin.jsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core' %>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>OpenID Login</title>
-
-    <!-- Simple OpenID Selector -->
-    <link rel="stylesheet" href="<c:url value='/css/openid.css'/>" />
-    <script type="text/javascript" src="<c:url value='/js/jquery-1.2.6.min.js'/>"></script>
-    <script type="text/javascript" src="<c:url value='/js/openid-jquery.js'/>"></script>
-
-    <script type="text/javascript">
-    $(document).ready(function() {
-        openid.init('openid_identifier');
-     //   openid.setDemoMode(true); Stops form submission for client javascript-only test purposes
-    });
-    </script>
-    <!-- /Simple OpenID Selector -->
-
-    <style type="text/css">
-        /* Basic page formatting. */
-        body {
-            font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
-        }
-    </style>
-</head>
-
-<body>
-
-<c:if test="${not empty param.login_error}">
-  <font color="red">
-    Your login attempt was not successful, try again.<br/><br/>
-    Reason: <c:out value="${SPRING_SECURITY_LAST_EXCEPTION.message}"/>.
-  </font>
-</c:if>
-
-<!-- Simple OpenID Selector -->
-<form action="<c:url value='j_spring_openid_security_check'/>" method="post" id="openid_form">
-    <input type="hidden" name="action" value="verify" />
-
-    <fieldset>
-            <legend>Sign-in or Create New Account</legend>
-
-            <div id="openid_choice">
-                <p>Please click your account provider:</p>
-                <div id="openid_btns"></div>
-
-            </div>
-
-            <div id="openid_input_area">
-                <input id="openid_identifier" name="openid_identifier" type="text" value="http://" />
-                <input id="openid_submit" type="submit" value="Sign-In"/>
-            </div>
-            <noscript>
-            <p>OpenID is a service that allows you to log-on to many different websites using a single identity.
-            Find out <a href="http://openid.net/what/">more about OpenID</a> and <a href="http://openid.net/get/">how to get an OpenID enabled account</a>.</p>
-            </noscript>
-    </fieldset>
-</form>
-<!-- /Simple OpenID Selector -->
-
-</body>
-</html>