diff --git a/doc/manual.xml b/doc/manual.xml
index 0d2c413692a9ae810a2041dae5a11cdb729c901c..58d4941be6ee48156e404caf2fb2581cf7cc6db8 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -3610,23 +3610,13 @@ oo_.posterior_hpdsup.measurement_errors_corr.gdp_conso
     </cmdsynopsis>
   </refsynopsisdiv>
 
-  <refsect1><title>Options</title>
+  <refsect1><title>Option</title>
   <variablelist>
     <varlistentry>
       <term><option>parameter_set</option> = <option>prior_mode</option> | <option>prior_mean</option> | <option>posterior_mode</option> | 
       <option>posterior_mean</option> | <option>posterior_median</option></term>
       <listitem><para>Specify the parameter set to use for running the smoother. Default value: <option>posterior_mean</option> if Metropolis has been run, else <option>posterior_mode</option>.</para></listitem>
     </varlistentry>
-    <varlistentry>
-      <term><option>shocks</option> = (
-      <replaceable>VARIABLE_NAME</replaceable> [<replaceable>VARIABLE_NAME</replaceable> ...]
-      [ ; <replaceable>VARIABLE_NAME</replaceable> [<replaceable>VARIABLE_NAME</replaceable> ...] ...] )</term>
-      <listitem><para>...</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><option>labels</option> = ( <replaceable>VARIABLE_NAME</replaceable> [<replaceable>VARIABLE_NAME</replaceable> ...] )</term>
-      <listitem><para>...</para></listitem>
-    </varlistentry>
   </variablelist>
   </refsect1>
 
diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index 1a25176e9b53a5458e1a90b238cf4e43c7241a98..2fcd65ebd08536dc068e2521af3c68f25e7c32f6 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -105,7 +105,7 @@ class ParsingDriver;
 %token <string_val> INT_NUMBER
 %token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF
 %token KALMAN_ALGO KALMAN_TOL
-%token LABELS LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR
+%token LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR
 %token MARKOWITZ MARGINAL_DENSITY MAX
 %token MFS MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER MIN MINIMAL_SOLVING_PERIODS
 %token MODE_CHECK MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_INFO MSHOCKS
@@ -889,24 +889,6 @@ symbol_list_ext : symbol_list
                   }
                 ;
 
-list_of_symbol_lists : symbol_list ';' symbol
-                       {
-                         string *semicolon = new string(";");
-			 driver.add_in_symbol_list(semicolon);
-			 driver.add_in_symbol_list($3);
-		       }
-                     | list_of_symbol_lists  symbol
-                       { driver.add_in_symbol_list($2); }
-                     | list_of_symbol_lists COMMA symbol
-                       { driver.add_in_symbol_list($3); }
-                     | list_of_symbol_lists ';' symbol
-                       {
-                         string *semicolon = new string(";");
-			 driver.add_in_symbol_list(semicolon);
-			 driver.add_in_symbol_list($3);
-		       }
-                     ;
-
 signed_integer : PLUS INT_NUMBER
                  { $$ = $2; }
                | MINUS INT_NUMBER
@@ -1321,11 +1303,11 @@ write_latex_static_model : WRITE_LATEX_STATIC_MODEL ';'
 
 shock_decomposition : SHOCK_DECOMPOSITION ';'
                       {driver.shock_decomposition(); }
-                    | SHOCK_DECOMPOSITION '(' shock_decomposition_options_list ')' ';'
+                    | SHOCK_DECOMPOSITION '(' o_parameter_set ')' ';'
                       { driver.shock_decomposition(); }
                     | SHOCK_DECOMPOSITION symbol_list ';'
                       { driver.shock_decomposition(); }
-                    | SHOCK_DECOMPOSITION '(' shock_decomposition_options_list ')' symbol_list ';'
+                    | SHOCK_DECOMPOSITION '(' o_parameter_set ')' symbol_list ';'
                       { driver.shock_decomposition(); }
                     ;
 
@@ -1571,15 +1553,6 @@ dynare_sensitivity_option : o_gsa_identification
                           | o_ar
                           ;
 
-shock_decomposition_options_list : shock_decomposition_option COMMA shock_decomposition_options_list
-                                 | shock_decomposition_option
-                                 ;
-
-shock_decomposition_option : o_parameter_set
-                           | o_shocks
-                           | o_labels
-                           ;
-
 homotopy_setup: HOMOTOPY_SETUP ';' homotopy_list END ';'
                { driver.end_homotopy();};
 
@@ -1824,9 +1797,6 @@ o_parameter_set : PARAMETER_SET EQUAL PRIOR_MODE
                   { driver.option_str("parameter_set", "posterior_median"); }
                 ;
 
-o_shocks : SHOCKS EQUAL '(' list_of_symbol_lists ')' { driver.option_symbol_list("shocks"); };
-o_labels : LABELS EQUAL '(' symbol_list ')' { driver.option_symbol_list("labels"); };
-
 o_freq : FREQ EQUAL INT_NUMBER {driver.option_num("ms.freq",$3); };
 o_initial_year : INITIAL_YEAR EQUAL INT_NUMBER {driver.option_num("ms.initial_year",$3); };
 o_initial_subperiod : INITIAL_SUBPERIOD EQUAL INT_NUMBER {driver.option_num("ms.initial_subperiod",$3); };
diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll
index 254739e21e69c61ea70951c322ba57842b064aef..6386902ac6602541d01e3bba342fae990b9ac59b 100644
--- a/preprocessor/DynareFlex.ll
+++ b/preprocessor/DynareFlex.ll
@@ -412,7 +412,6 @@ string eofbuff;
 <DYNARE_STATEMENT>xls_range {return token::XLS_RANGE;}
 <DYNARE_STATEMENT>mh_recover {return token::MH_RECOVER;}
 <DYNARE_STATEMENT>planner_discount {return token::PLANNER_DISCOUNT;}
-<DYNARE_STATEMENT>labels {return token::LABELS;}
 
 <DYNARE_BLOCK>equation {return token::EQUATION;}
 <DYNARE_BLOCK>exclusion {return token::EXCLUSION;}