diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index c510ff69f..7b1069142 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -4054,13 +4054,6 @@ USE_XML_SQUADNAMES = FALSE
 
 CLOCK_SPEED_PERCENT = 120
 
-;------------------------------------------------------------------------------------------------------------------------------
-; Clock speed percent during enemy turns
-; Range: 100 - 300   Default: 150
-;------------------------------------------------------------------------------------------------------------------------------
-
-ENEMY_CLOCK_SPEED_PERCENT = 120
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Timeslice in microseconds. The frequency that the screen is refreshed.
 ; At normal speed the clock is updated every 16 milliseconds. 
@@ -4070,27 +4063,12 @@ ENEMY_CLOCK_SPEED_PERCENT = 120
 UPDATE_FREQUENCY = 16000
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Improved auto fast forwarding.
-; AUTO_FAST_FORWARD_ENEMIES:
-; 0 - default behaviour
-; 1 - auto fast forward only enemies that are not seen by player's team
-; 2 - auto fast forward only invisible enemies
-; 3 - auto fast forward all enemies
-; AUTO_FAST_FORWARD_MILITIA:
-; 0 - default behaviour
-; 1 - auto fast forward only militia that does not see enemies
-; 2 - auto fast forward militia always
-; AUTO_FAST_FORWARD_CIVS, AUTO_FAST_FORWARD_CREATURES:
-; 0 - default behaviour
-; 1 - auto fast forward only invisible
-; 2 - auto fast forward always
-; Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed
+; Improved auto fast forwarding. Do not accelerate visible soldiers
+; Note: Even for invisible soldiers, only movement is accelerated
+; most of specific actions like shooting and tossing grenades are performed at normal speed
 ;------------------------------------------------------------------------------------------------------------------------------
 
-AUTO_FAST_FORWARD_ENEMIES = 2
-AUTO_FAST_FORWARD_MILITIA = 1
-AUTO_FAST_FORWARD_CIVS = 1
-AUTO_FAST_FORWARD_CREATURES = 1
+IMPROVED_AUTO_FAST_FORWARD = TRUE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Fast forward timeslice in milliseconds.  The frequency that the base clock is updated.
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 9ebb5cc63..9263a59c2 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -4002,13 +4002,6 @@ USE_XML_SQUADNAMES = FALSE
 
 CLOCK_SPEED_PERCENT = 120
 
-;------------------------------------------------------------------------------------------------------------------------------
-; Clock speed percent during enemy turns
-; Range: 100 - 300   Default: 150
-;------------------------------------------------------------------------------------------------------------------------------
-
-ENEMY_CLOCK_SPEED_PERCENT = 120
-
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Timeslice in microseconds. The frequency that the screen is refreshed.
 ; At normal speed the clock is updated every 16 milliseconds. 
@@ -4018,27 +4011,12 @@ ENEMY_CLOCK_SPEED_PERCENT = 120
 UPDATE_FREQUENCY = 16000
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; Improved auto fast forwarding.
-; AUTO_FAST_FORWARD_ENEMIES:
-; 0 - default behaviour
-; 1 - auto fast forward only enemies that are not seen by player's team
-; 2 - auto fast forward only invisible enemies
-; 3 - auto fast forward all enemies
-; AUTO_FAST_FORWARD_MILITIA:
-; 0 - default behaviour
-; 1 - auto fast forward only militia that does not see enemies
-; 2 - auto fast forward militia always
-; AUTO_FAST_FORWARD_CIVS, AUTO_FAST_FORWARD_CREATURES:
-; 0 - default behaviour
-; 1 - auto fast forward only invisible
-; 2 - auto fast forward always
-; Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed
+; Improved auto fast forwarding. Do not accelerate visible soldiers
+; Note: Even for invisible soldiers, only movement is accelerated
+; most of specific actions like shooting and tossing grenades are performed at normal speed
 ;------------------------------------------------------------------------------------------------------------------------------
 
-AUTO_FAST_FORWARD_ENEMIES = 0
-AUTO_FAST_FORWARD_MILITIA = 0
-AUTO_FAST_FORWARD_CIVS = 0
-AUTO_FAST_FORWARD_CREATURES = 0
+IMPROVED_AUTO_FAST_FORWARD = TRUE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Fast forward timeslice in milliseconds.  The frequency that the base clock is updated.