diff --git a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
index bb0f9ff3e44008698a0869b4692cdce1b6698dbd..5f3c10c005653d45109ea8feb1fd6d29ab55579d 100644
--- a/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
+++ b/src/main/java/org/sablecc/sablecc/lexer/Lexer.java
@@ -7,10 +7,6 @@ import java.io.DataInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PushbackReader;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import de.hhu.stups.sablecc.patch.IToken;
 
 import org.sablecc.sablecc.node.*;
 
@@ -27,61 +23,34 @@ public class Lexer
     private boolean eof;
     private final StringBuilder text = new StringBuilder();
 
-    @Deprecated
-    private final Queue<IToken> nextList = new LinkedList<IToken>();
-
-    /**
-     * @deprecated Use {@link #token} to get, modify, replace, and/or delete the current token.
-     *     Injecting new tokens into the token stream will not be supported in the future.
-     */
-    @Deprecated
-    public Queue<IToken> getNextList() {
-        return nextList;
-    }
-
     protected void filter() throws LexerException, IOException
     {}
 
-    /**
-     * @deprecated Override {@link #filter()} instead.
-     */
-    @Deprecated
-    protected void filterWrap() throws LexerException, IOException
-    {
-        filter();
-        if (token != null) {
-            nextList.add(token);
-        }
-    }
-
-
     public Lexer(PushbackReader in)
     {
         this.in = in;
     }
 
-    @SuppressWarnings("deprecation") // because of filterWrap and nextList
     public Token peek() throws LexerException, IOException
     {
         while(this.token == null)
         {
             token = getToken();
-            filterWrap();
+            filter();
         }
 
-        return (Token) nextList.peek();
+        return token;
     }
 
-    @SuppressWarnings("deprecation") // because of filterWrap and nextList
     public Token next() throws LexerException, IOException
     {
         while(this.token == null)
         {
             token = getToken();
-            filterWrap();
+            filter();
         }
 
-        Token result = (Token) nextList.poll();
+        Token result = token;
         token = null;
         return result;
     }
diff --git a/src/main/resources/org/sablecc/sablecc/lexer.txt b/src/main/resources/org/sablecc/sablecc/lexer.txt
index d441b05d32d84180ba5591471048cbeadb56dd5e..7858fab39d6a7a6d2afc9ebc506c5302dbe8d986 100644
--- a/src/main/resources/org/sablecc/sablecc/lexer.txt
+++ b/src/main/resources/org/sablecc/sablecc/lexer.txt
@@ -31,10 +31,6 @@ import java.io.DataInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.PushbackReader;
-import java.util.LinkedList;
-import java.util.Queue;
-
-import de.hhu.stups.sablecc.patch.IToken;
 
 import $0$node.*;
 
@@ -51,61 +47,34 @@ public class Lexer
     private boolean eof;
     private final StringBuilder text = new StringBuilder();
 
-    @Deprecated
-    private final Queue<IToken> nextList = new LinkedList<IToken>();
-
-    /**
-     * @deprecated Use {@link #token} to get, modify, replace, and/or delete the current token.
-     *     Injecting new tokens into the token stream will not be supported in the future.
-     */
-    @Deprecated
-    public Queue<IToken> getNextList() {
-        return nextList;
-    }
-
     protected void filter() throws LexerException, IOException
     {}
 
-    /**
-     * @deprecated Override {@link #filter()} instead.
-     */
-    @Deprecated
-    protected void filterWrap() throws LexerException, IOException
-    {
-        filter();
-        if (token != null) {
-            nextList.add(token);
-        }
-    }
-
-
     public Lexer(PushbackReader in)
     {
         this.in = in;
     }
 
-    @SuppressWarnings("deprecation") // because of filterWrap and nextList
     public Token peek() throws LexerException, IOException
     {
         while(this.token == null)
         {
             token = getToken();
-            filterWrap();
+            filter();
         }
 
-        return (Token) nextList.peek();
+        return token;
     }
 
-    @SuppressWarnings("deprecation") // because of filterWrap and nextList
     public Token next() throws LexerException, IOException
     {
         while(this.token == null)
         {
             token = getToken();
-            filterWrap();
+            filter();
         }
 
-        Token result = (Token) nextList.poll();
+        Token result = token;
         token = null;
         return result;
     }