diff --git a/kratos.gid/apps/FreeSurface/xml/Main.spd b/kratos.gid/apps/FreeSurface/xml/Main.spd
index ad5deec5e..25c6ffe93 100644
--- a/kratos.gid/apps/FreeSurface/xml/Main.spd
+++ b/kratos.gid/apps/FreeSurface/xml/Main.spd
@@ -9,5 +9,5 @@
     <include n="SolutionStrategy" active="1" path="apps/Fluid/xml/SolutionStrategy.spd"/>
     <include n="Results" active="1" un="FLResults" path="apps/Common/xml/Results.spd"/>
     <include n="GenericSubModelPart" active="1" path="apps/Common/xml/GenericSubModelPart.spd"/>
-    <include n="Materials" active="1" path="apps/Fluid/xml/Materials.spd"/>
-</container>
+    <include n="Materials" active="0" path="apps/Fluid/xml/Materials.spd"/>
+    </container>
diff --git a/kratos.gid/apps/FreeSurface/xml/Parts.spd b/kratos.gid/apps/FreeSurface/xml/Parts.spd
index b86a61714..efb796d22 100644
--- a/kratos.gid/apps/FreeSurface/xml/Parts.spd
+++ b/kratos.gid/apps/FreeSurface/xml/Parts.spd
@@ -2,12 +2,5 @@
 
 <condition n="FluidParts" pn="Parts" ov="[CheckGeometry 1]" icon="reservoir16" help="Select your group" un="FLParts" update_proc="UpdateParts">
 	<value n="Element" pn="Element" v="" dict="[GetElements]" actualize="1" values="" state="hidden">
-		<dependencies node="../value[@n!='Material']" actualize="1"/>
-	</value>
-	<value n="ConstitutiveLaw" pn="Fluid type" v="" actualize_tree="1" values="[GetConstitutiveLaws]" state="hidden" dict="[GetAllConstitutiveLaws]">
-		<dependencies node="../value[@n!='Material']" actualize="1"/>
-	</value>
-	<value n="Material" pn="Material" state="hidden" help="Choose a material from the database" v="Air" values="[GetMaterialsList]">
-		<edit_command n="Edit materials" pn="Edit materials" icon="refresh.png" proc='EditDatabaseList'/>
 	</value>
 </condition>
diff --git a/kratos.gid/apps/FreeSurface/xml/XmlController.tcl b/kratos.gid/apps/FreeSurface/xml/XmlController.tcl
index 22c41053c..0aaeb496c 100644
--- a/kratos.gid/apps/FreeSurface/xml/XmlController.tcl
+++ b/kratos.gid/apps/FreeSurface/xml/XmlController.tcl
@@ -20,9 +20,12 @@ proc ::FreeSurface::xml::Init { } {
     Model::getConditions Conditions.xml
 
 
-    # Remove No splip
+    # Remove No slip
     Model::ForgetCondition NoSlip2D
     Model::ForgetCondition NoSlip3D
+    # Remove Wall Law
+    Model::ForgetCondition WallLaw2D
+    Model::ForgetCondition WallLaw3D
 }
 
 proc ::FreeSurface::xml::getUniqueName {name} {
@@ -40,7 +43,7 @@ proc ::FreeSurface::xml::CustomTree { args } {
     spdAux::SetValueOnTreeItem v 9.8 FLGravity GravityValue
 
     set root [customlib::GetBaseRoot]
-    foreach {n pn} [list LIN_DARCY_COEF "Linear darcy coefficient" NONLIN_DARCY_COEF "Nonlinear darcy coefficient" POROSITY "Porosity" BODY_FORCE "Body force"] {
+    foreach {n pn} [list LIN_DARCY_COEF "Linear darcy coefficient" NONLIN_DARCY_COEF "Nonlinear darcy coefficient" POROSITY "Porosity"] {
         if {[$root selectNodes "[spdAux::getRoute NodalResults]/value\[@n='$n'\]"] eq ""} {
             gid_groups_conds::addF [spdAux::getRoute NodalResults] value [list n $n pn $pn v Yes values "Yes,No"]
         }