diff --git a/infer/src/llvm/lLexer.mll b/infer/src/llvm/lLexer.mll
index e4073b66a..4dfcbeb5f 100644
--- a/infer/src/llvm/lLexer.mll
+++ b/infer/src/llvm/lLexer.mll
@@ -60,7 +60,7 @@ rule token = parse
   | "fp128"  { FP128 }
   | "x86_fp80"  { X86_FP80 }
   | "ppc_fp128"  { PPC_FP128 }
-  | "x86_mmx"  { X86_MMX }
+  (*| "x86_mmx"  { X86_MMX }*)
   | "label"  { LABEL }
   | "metadata"  { METADATA }
 
@@ -76,11 +76,11 @@ rule token = parse
   (* terminator instructions *)
   | "ret"  { RET }
   | "br"  { BR }
-  | "switch"  { SWITCH }
+  (*| "switch"  { SWITCH }
   | "indirectbr"  { INDIRECTBR }
   | "invoke"  { INVOKE }
   | "resume"  { RESUME }
-  | "unreachable"  { UNREACHABLE }
+  | "unreachable"  { UNREACHABLE }*)
   (* binary operations *)
   | "add"  { ADD }
   | "fadd"  { FADD }
@@ -114,41 +114,41 @@ rule token = parse
   (* vector operations *)
   | "extractelement"  { EXTRACTELEMENT }
   | "insertelement" { INSERTELEMENT }
-  | "shufflevector" { SHUFFLEVECTOR }
+  (*| "shufflevector" { SHUFFLEVECTOR }*)
   (* aggregate operations *)
-  | "extractvalue"  { EXTRACTVALUE }
-  | "insertvalue" { INSERTVALUE }
+  (*| "extractvalue"  { EXTRACTVALUE }*)
+  (*| "insertvalue" { INSERTVALUE }*)
   (* memory access and addressing operations *)
-  | "alloca"  { ALLOCA }
-  | "load"  { LOAD }
-  | "store" { STORE }
-  | "fence" { FENCE }
-  | "cmpxchg" { CMPXCHG }
-  | "atomicrmw" { ATOMICRMW }
-  | "getelementptr" { GETELEMENTPTR }
+  (*| "alloca"  { ALLOCA }*)
+  (*| "load"  { LOAD }*)
+  (*| "store" { STORE }*)
+  (*| "fence" { FENCE }*)
+  (*| "cmpxchg" { CMPXCHG }*)
+  (*| "atomicrmw" { ATOMICRMW }*)
+  (*| "getelementptr" { GETELEMENTPTR }*)
   (* conversion operations *)
-  | "trunc" { TRUNC } (* e.g. trunc ... to ... *)
-  | "zext"  { ZEXT }
-  | "sext"  { SEXT }
-  | "fptrunc" { FPTRUNC }
-  | "fpext" { FPEXT }
-  | "fptoui"  { FPTOUI }
-  | "fptosi"  { FPTOSI }
-  | "uitofp"  { UITOFP }
-  | "sitofp"  { SITOFP }
-  | "ptrtoint"  { PTRTOINT }
-  | "inttoptr"  { INTTOPTR }
-  | "bitcast" { BITCAST }
-  | "addrspacecast" { ADDRSPACECAST }
-  | "to"  { TO } (* all conversion operations include this keyword *)
+  (*| "trunc" { TRUNC }*) (* e.g. trunc ... to ... *)
+  (*| "zext"  { ZEXT }*)
+  (*| "sext"  { SEXT }*)
+  (*| "fptrunc" { FPTRUNC }*)
+  (*| "fpext" { FPEXT }*)
+  (*| "fptoui"  { FPTOUI }*)
+  (*| "fptosi"  { FPTOSI }*)
+  (*| "uitofp"  { UITOFP }*)
+  (*| "sitofp"  { SITOFP }*)
+  (*| "ptrtoint"  { PTRTOINT }*)
+  (*| "inttoptr"  { INTTOPTR }*)
+  (*| "bitcast" { BITCAST }*)
+  (*| "addrspacecast" { ADDRSPACECAST }*)
+  (*| "to"  { TO }*) (* all conversion operations include this keyword *)
   (* other operations *)
-  | "icmp"  { ICMP }
-  | "fcmp"  { FCMP }
-  | "phi" { PHI }
-  | "select"  { SELECT }
-  | "call"  { CALL }
-  | "va_arg"  { VA_ARG }
-  | "landingpad"  { LANDINGPAD }
+  (*| "icmp"  { ICMP }*)
+  (*| "fcmp"  { FCMP }*)
+  (*| "phi" { PHI }*)
+  (*| "select"  { SELECT }*)
+  (*| "call"  { CALL }*)
+  (*| "va_arg"  { VA_ARG }*)
+  (*| "landingpad"  { LANDINGPAD }*)
 
   (* identifiers - make this complete *)
   | '@'  { AT }
diff --git a/infer/src/llvm/lParser.mly b/infer/src/llvm/lParser.mly
index 4c1521d27..e45890086 100644
--- a/infer/src/llvm/lParser.mly
+++ b/infer/src/llvm/lParser.mly
@@ -40,7 +40,7 @@
 %token FP128
 %token X86_FP80
 %token PPC_FP128
-%token X86_MMX
+(*%token X86_MMX*)
 %token LABEL
 %token METADATA
 
@@ -53,11 +53,11 @@
 (* terminator instructions *)
 %token RET
 %token BR
-%token SWITCH
-%token INDIRECTBR
-%token INVOKE
-%token RESUME
-%token UNREACHABLE
+(*%token SWITCH*)
+(*%token INDIRECTBR*)
+(*%token INVOKE*)
+(*%token RESUME*)
+(*%token UNREACHABLE*)
 (* binary operations *)
 %token ADD
 %token FADD
@@ -91,41 +91,41 @@
 (* vector operations *)
 %token EXTRACTELEMENT
 %token INSERTELEMENT
-%token SHUFFLEVECTOR
+(*%token SHUFFLEVECTOR*)
 (* aggregate operations *)
-%token EXTRACTVALUE
-%token INSERTVALUE
+(*%token EXTRACTVALUE*)
+(*%token INSERTVALUE*)
 (* memory access and addressing operations *)
-%token ALLOCA
-%token LOAD
-%token STORE
-%token FENCE
-%token CMPXCHG
-%token ATOMICRMW
-%token GETELEMENTPTR
+(*%token ALLOCA*)
+(*%token LOAD*)
+(*%token STORE*)
+(*%token FENCE*)
+(*%token CMPXCHG*)
+(*%token ATOMICRMW*)
+(*%token GETELEMENTPTR*)
 (* conversion operations *)
-%token TRUNC
-%token ZEXT
-%token SEXT
-%token FPTRUNC
-%token FPEXT
-%token FPTOUI
-%token FPTOSI
-%token UITOFP
-%token SITOFP
-%token PTRTOINT
-%token INTTOPTR
-%token BITCAST
-%token ADDRSPACECAST
-%token TO
+(*%token TRUNC*)
+(*%token ZEXT*)
+(*%token SEXT*)
+(*%token FPTRUNC*)
+(*%token FPEXT*)
+(*%token FPTOUI*)
+(*%token FPTOSI*)
+(*%token UITOFP*)
+(*%token SITOFP*)
+(*%token PTRTOINT*)
+(*%token INTTOPTR*)
+(*%token BITCAST*)
+(*%token ADDRSPACECAST*)
+(*%token TO*)
 (* other operations *)
-%token ICMP
-%token FCMP
-%token PHI
-%token SELECT
-%token CALL
-%token VA_ARG
-%token LANDINGPAD
+(*%token ICMP*)
+(*%token FCMP*)
+(*%token PHI*)
+(*%token SELECT*)
+(*%token CALL*)
+(*%token VA_ARG*)
+(*%token LANDINGPAD*)
 
 %token <string> IDENT