diff --git a/src/DynareBison.yy b/src/DynareBison.yy
index 9c8b9d213267c53cd8b587cb775afaa4f95c35b3..416c4d382cee296c0af28cfd988526b3c42ad043 100644
--- a/src/DynareBison.yy
+++ b/src/DynareBison.yy
@@ -175,7 +175,7 @@ class ParsingDriver;
 %token PARAMETER_CONVERGENCE_CRITERION NUMBER_OF_LARGE_PERTURBATIONS NUMBER_OF_SMALL_PERTURBATIONS
 %token NUMBER_OF_POSTERIOR_DRAWS_AFTER_PERTURBATION MAX_NUMBER_OF_STAGES
 %token RANDOM_FUNCTION_CONVERGENCE_CRITERION RANDOM_PARAMETER_CONVERGENCE_CRITERION NO_INIT_ESTIMATION_CHECK_FIRST_OBS
-%token HETEROSKEDASTIC_FILTER TIME_SHIFT STRUCTURAL TERMINAL_STEADY_STATE_AS_GUESS_VALUE CONSTANT_SIMULATION_LENGTH
+%token HETEROSKEDASTIC_FILTER TIME_SHIFT STRUCTURAL CONSTANT_SIMULATION_LENGTH
 %token SURPRISE OCCBIN_CONSTRAINTS
 %token PAC_TARGET_INFO COMPONENT TARGET AUXNAME AUXNAME_TARGET_NONSTATIONARY PAC_TARGET_NONSTATIONARY
 %token <string> KIND LL DL DD ADD MULTIPLY
@@ -1477,8 +1477,7 @@ perfect_foresight_with_expectation_errors_solver_options_list : perfect_foresigh
                                                               | perfect_foresight_with_expectation_errors_solver_options
                                                               ;
 
-perfect_foresight_with_expectation_errors_solver_options : o_pfwee_terminal_steady_state_as_guess_value
-                                                         | o_pfwee_constant_simulation_length
+perfect_foresight_with_expectation_errors_solver_options : o_pfwee_constant_simulation_length
                                                          | perfect_foresight_solver_options
                                                          ;
 
@@ -4066,7 +4065,6 @@ o_colormap : COLORMAP EQUAL symbol { driver.option_num("plot_shock_decomp.colorm
 o_icd_colormap : COLORMAP EQUAL symbol { driver.option_num("initial_condition_decomp.colormap",$3); };
 o_no_init_estimation_check_first_obs : NO_INIT_ESTIMATION_CHECK_FIRST_OBS { driver.option_num("no_init_estimation_check_first_obs", "true"); };
 o_heteroskedastic_filter : HETEROSKEDASTIC_FILTER { driver.option_num("heteroskedastic_filter", "true"); };
-o_pfwee_terminal_steady_state_as_guess_value : TERMINAL_STEADY_STATE_AS_GUESS_VALUE { driver.option_num("pfwee.terminal_steady_state_as_guess_value", "true"); };
 o_pfwee_constant_simulation_length : CONSTANT_SIMULATION_LENGTH { driver.option_num("pfwee.constant_simulation_length", "true"); };
 o_fsolve_options : FSOLVE_OPTIONS EQUAL '(' name_value_pair_with_boolean_list ')' { driver.option_str("fsolve_options", $4); };
 
diff --git a/src/DynareFlex.ll b/src/DynareFlex.ll
index 3d0641d0b9150b0b52f0af7c327dfc9c2281c4f6..eb3b4f4008b360d5c7e409a49c73b68d9ea77e60 100644
--- a/src/DynareFlex.ll
+++ b/src/DynareFlex.ll
@@ -882,7 +882,6 @@ DATE -?[0-9]+([ya]|m([1-9]|1[0-2])|q[1-4])
 <DYNARE_STATEMENT>no_homotopy {return token::NO_HOMOTOPY;}
 <DYNARE_STATEMENT>homotopy_alt_starting_point {return token::HOMOTOPY_ALT_STARTING_POINT;}
 <DYNARE_STATEMENT>particle_filter_options {return token::PARTICLE_FILTER_OPTIONS;}
-<DYNARE_STATEMENT>terminal_steady_state_as_guess_value {return token::TERMINAL_STEADY_STATE_AS_GUESS_VALUE;}
 <DYNARE_STATEMENT>constant_simulation_length {return token::CONSTANT_SIMULATION_LENGTH;}
 <DYNARE_STATEMENT>block_static { return token::BLOCK_STATIC; }
 <DYNARE_STATEMENT>block_dynamic { return token::BLOCK_DYNAMIC; }