diff --git a/src/oud2_parser.pl b/src/oud2_parser.pl
index f4c73be7a50bba02a71c41aa19083542ae4be203..67248a9b7ccbac218ce71d3f9e5c7d03a2b48d68 100644
--- a/src/oud2_parser.pl
+++ b/src/oud2_parser.pl
@@ -303,14 +303,8 @@ JIKOKU			::= TS_TIMESTAMPS
 # TODO There are actually more possible end timestamps
 TS_TIMESTAMPS		::= TS_TIMESTAMP+
 			    action => Dia::take_all
-			    # separator => COMMA
-			    # proper => 1
 TS_TIMESTAMP		::= TS_TIMESTAMP_STRUCT COMMA
 			    action => ::first
-TS_TIMESTAMP_FIRST	::= TS_TIMESTAMP_STRUCT
-			    action => ::first
-TS_TIMESTAMP_LAST	::= TS_TIMESTAMP_STRUCT
-			    action => ::first
 TS_TIMESTAMP_STRUCT   	::= TS_TIMESTAMP_WITHT
 			    action => ::first
 			 || TS_TIMESTAMP_NOT
@@ -345,10 +339,6 @@ TS_INT			~ [\d]+
 VERSIONING		::= NAME
 NAME	   		~ [^\v]*
 
-Rest ::= action => ::undef
-Rest ::= GARBAGE action => ::undef
-:lexeme ~ GARBAGE priority => -9
-GARBAGE	~ [\s\S]+
 :lexeme ~ GARBAGE_LINE priority => -99999999
 GARBAGE_LINES	       ::= GARBAGE_LINE*
 GARBAGE_LINE	       	~ [^\v]*