diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml
index 8fbc9a6f..93f49320 100644
--- a/Systems/fmgc-drivers.xml
+++ b/Systems/fmgc-drivers.xml
@@ -43,23 +43,6 @@
 	</predict-simple>
 	
 	<!-- Autopilot Helpers/Calculators -->
-	<filter> <!-- Replace -->
-		<name>AUTOLAND FD FPM</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input> 
-			<expression>
-				<table>
-					<property>/position/gear-agl-ft</property> 
-					<entry><ind>100</ind><dep>-650</dep></entry>
-					<entry><ind> 50</ind><dep>-500</dep></entry>
-					<entry><ind> 45</ind><dep> -70</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/it-autoflight/internal/target-fpm-c2</output>
-	</filter>
-	
 	<filter>
 		<name>FMGC Managed Knots</name>
 		<type>gain</type>
@@ -152,7 +135,12 @@
 					<value>T/O CLB</value>
 				</equals>
 			</condition>
-			<property>/it-autoflight/settings/togaspd</property>
+			<expression>
+				<sum>
+					<property>/it-autoflight/settings/togaspd</property>
+					<value>10</value>
+				</sum>
+			</expression>
 		</input>
 		<input>/it-autoflight/input/spd-kts</input>
 		<output>/it-autoflight/internal/flch-kts</output>
diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index f0a1bdbf..28d26a6c 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -122,12 +122,6 @@
 				<value>120</value>
 			</u_min>
 			<u_min>
-				<condition>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>1</value>
-					</equals>
-				</condition>
 				<expression>
 					<difference>
 						<property>/it-autoflight/internal/vert-speed-fpm</property>
@@ -135,32 +129,6 @@
 					</difference>
 				</expression>
 			</u_min>
-			<u_max>
-				<condition>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/thr-mode</property>
-							<value>2</value>
-						</equals>
-						<and>
-							<equals>
-								<property>/gear/gear[1]/wow</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/gear/gear[2]/wow</property>
-								<value>0</value>
-							</equals>
-						</and>
-					</and>
-				</condition>
-				<expression>
-					<sum>
-						<property>/it-autoflight/internal/vert-speed-fpm</property>
-						<value>2500</value>
-					</sum>
-				</expression>
-			</u_max>
 			<u_max>
 				<condition>
 					<and>
@@ -191,27 +159,7 @@
 				</condition>
 				<value>-120</value>
 			</u_max>
-			<u_min>
-				<condition>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</condition>
-				<expression>
-					<difference>
-						<property>/it-autoflight/internal/vert-speed-fpm</property>
-						<value>2500</value>
-					</difference>
-				</expression>
-			</u_min>
 			<u_max>
-				<condition>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</condition>
 				<expression>
 					<sum>
 						<property>/it-autoflight/internal/vert-speed-fpm</property>
@@ -560,11 +508,14 @@
 			<Td>0.0001</Td>
 			<u_min>
 				<condition>
-					<not-equals>
+					<equals>
 						<property>/it-autoflight/output/vert</property>
 						<value>6</value>
-					</not-equals>
+					</equals>
 				</condition>
+				<value>0</value>
+			</u_min>
+			<u_min>
 				<expression>
 					<max>
 						<dif>
@@ -575,38 +526,6 @@
 					</max>
 				</expression>
 			</u_min>
-			<u_min>
-				<condition>
-					<equals>
-						<property>/it-autoflight/output/vert</property>
-						<value>6</value>
-					</equals>
-				</condition>
-				<value>0</value>
-			</u_min>
-			<u_max>
-				<condition>
-					<and>
-						<equals>
-							<property>/gear/gear[1]/wow</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/gear/gear[2]/wow</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</condition>
-				<expression>
-					<min>
-						<sum>
-							<property>/orientation/pitch-deg</property>
-							<value>5</value>
-						</sum>
-						<value>30</value>
-					</min>
-				</expression>
-			</u_max>
 			<u_max>
 				<condition>
 					<or>
@@ -622,6 +541,34 @@
 				</condition>
 				<value>10</value>
 			</u_max>
+			<u_max>
+				<condition>
+					<equals>
+						<property>/it-autoflight/output/vert</property>
+						<value>7</value>
+					</equals>
+				</condition>
+				<expression>
+					<min>
+						<sum>
+							<property>/orientation/pitch-deg</property>
+							<value>5</value>
+						</sum>
+						<value>18</value>
+					</min>
+				</expression>
+			</u_max>
+			<u_max>
+				<expression>
+					<min>
+						<sum>
+							<property>/orientation/pitch-deg</property>
+							<value>5</value>
+						</sum>
+						<value>30</value>
+					</min>
+				</expression>
+			</u_max>
 		</config>
 	</pid-controller>