diff --git a/model/src/main/java/org/gluu/oxtrust/model/GluuMetadataSourceType.java b/model/src/main/java/org/gluu/oxtrust/model/GluuMetadataSourceType.java
index 125b79d2f..900ace283 100644
--- a/model/src/main/java/org/gluu/oxtrust/model/GluuMetadataSourceType.java
+++ b/model/src/main/java/org/gluu/oxtrust/model/GluuMetadataSourceType.java
@@ -18,7 +18,7 @@
  */
 public enum GluuMetadataSourceType implements AttributeEnum {
 
-	NONE("none", "None"), FILE("file", "File"), URI("uri", "URI"), FEDERATION("federation", "Federation");
+	FILE("file", "File"), URI("uri", "URI"), FEDERATION("federation", "Federation");
 
 	private final String value;
 	private final String displayName;
diff --git a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml
index 069c73d19..ac39f5959 100644
--- a/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml
+++ b/server/src/main/webapp/WEB-INF/incl/trustmanager/trustForm.xhtml
@@ -22,12 +22,6 @@
             }
         }
 
-    function changeEvent(element) {
-    var val = $(element).find('option:selected').text();
-    if(val === 'None') {
-       #{rich:component('createSPMetadata:createSPMeatadataModalPanel')}.show();
-    }
-	}        
     </h:outputScript>
 	<ui:include
 		src="/WEB-INF/incl/trustmanager/configureMetadataFiltersPanel.xhtml" />
@@ -79,20 +73,6 @@
 	width: 220px;
 }
 
-#spMetadataPanel_container {
-	z-index: 999 !important;
-}
-
-#spMetadataPanel_content_scroller {
-	width: 700px !important;
-	height: 500px !important;
-}
-
-#spMetadataPanel_content {
-	width: 700px !important;
-	height: 500px !important;
-}
-
 pre {
 	height: 450px !important;
 }
@@ -158,7 +138,7 @@ input[submit] {
 												<h:selectOneMenu
 													styleClass=" rounded form-control MetaDataType"
 													value="#{_trustRelationship.spMetaDataSourceType}"
-													onchange="changeEvent(this)" required="true"
+													required="true"
 													id="spMetaDataSourceTypeId"
 													converter="omnifaces.GenericEnumConverter">
 													<f:selectItem noSelectionOption="true"