remove raw tag parser check for specific tokens
remove unused code