diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml
index 9d53553b..d6b09665 100644
--- a/Systems/fbw-pitch.xml
+++ b/Systems/fbw-pitch.xml
@@ -273,186 +273,9 @@
 		<output>/controls/flight/elevator-fbw</output>
 	</filter>
 	
-	<pid-controller>
-		<name>FBW PITCH HELPER PLUS</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<greater-than>
-						<property>/controls/flight/elevator-fbw</property>
-						<value>0.01</value>
-					</greater-than>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/position/gear-agl-ft</property>
-								<value>100</value>
-							</greater-than-equals>
-							<or>
-								<equals>
-									<property>/it-autoflight/output/ap1</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/it-autoflight/output/ap2</property>
-									<value>1</value>
-								</equals>
-							</or>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/position/gear-agl-ft</property>
-								<value>50</value>
-							</greater-than-equals>
-							<equals>
-								<property>/it-autoflight/output/ap1</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/it-autoflight/output/ap2</property>
-								<value>0</value>
-							</equals>
-						</and>
-					</or>
-					<less-than>
-						<property>/fdm/jsbsim/forces/load-factor</property>
-						<value>-0.5</value>
-					</less-than>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<value>0</value>
-		</input>
-		<reference>
-			<value>1</value>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-trim-cmd</property>
-		</output>
-		<config>
-			<Kp>0.09</Kp>
-			<beta>1.0</beta>
-			<alpha>0.1</alpha>
-			<gamma>0.0</gamma>
-			<Ti>10</Ti>
-			<Td>0.00001</Td>
-			<u_min>-1.0</u_min>
-			<u_max>1.0</u_max>
-		</config>
-	</pid-controller>
-	
-	<pid-controller>
-		<name>FBW PITCH HELPER MINUS</name>
-		<debug>false</debug>
-		<enable>
-			<condition>
-				<and>
-					<less-than>
-						<property>/controls/flight/elevator-fbw</property>
-						<value>-0.01</value>
-					</less-than>
-					<less-than>
-						<property>/orientation/roll-deg</property>
-						<value>40</value>
-					</less-than>
-					<greater-than>
-						<property>/orientation/roll-deg</property>
-						<value>-40</value>
-					</greater-than>
-					<or>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-fbw/law</property>
-							<value>1</value>
-						</equals>
-					</or>
-					<or>
-						<and>
-							<greater-than-equals>
-								<property>/position/gear-agl-ft</property>
-								<value>100</value>
-							</greater-than-equals>
-							<or>
-								<equals>
-									<property>/it-autoflight/output/ap1</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/it-autoflight/output/ap2</property>
-									<value>1</value>
-								</equals>
-							</or>
-						</and>
-						<and>
-							<greater-than-equals>
-								<property>/position/gear-agl-ft</property>
-								<value>50</value>
-							</greater-than-equals>
-							<equals>
-								<property>/it-autoflight/output/ap1</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/it-autoflight/output/ap2</property>
-								<value>0</value>
-							</equals>
-						</and>
-					</or>
-					<less-than>
-						<property>/fdm/jsbsim/forces/load-factor</property>
-						<value>-0.5</value>
-					</less-than>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<value>0</value>
-		</input>
-		<reference>
-			<value>1</value>
-		</reference>
-		<output>
-			<property>/controls/flight/elevator-trim-cmd</property>
-		</output>
-		<config>
-			<Kp>-0.09</Kp>
-			<beta>1.0</beta>
-			<alpha>0.1</alpha>
-			<gamma>0.0</gamma>
-			<Ti>10</Ti>
-			<Td>0.00001</Td>
-			<u_min>-1.0</u_min>
-			<u_max>1.0</u_max>
-		</config>
-	</pid-controller>
-		
 	<filter>
-		<name>IT-FBW: PITCH TRIM FILTER</name>
+		<name>IT-FBW: PITCH TRIM</name>
 		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
 		<initialize-to>output</initialize-to>
 		<enable>
 			<condition>
@@ -527,7 +350,22 @@
 			</condition>
 		</enable>
 		<input>
-			<property>/controls/flight/elevator-trim-cmd</property>
+			<condition>
+				<greater-than>
+					<property>/controls/flight/elevator-fbw</property>
+					<value>0.01</value>
+				</greater-than>
+			</condition>
+			<value>1</value>
+		</input>
+		<input>
+			<condition>
+				<less-than>
+					<property>/controls/flight/elevator-fbw</property>
+					<value>-0.01</value>
+				</less-than>
+			</condition>
+			<value>-1</value>
 		</input>
 		<output>/controls/flight/elevator-trim</output>
 		<type>noise-spike</type>