diff --git a/src/CppParser/Bindings/CLI/CppParser.cpp b/src/CppParser/Bindings/CLI/CppParser.cpp
index aaf8e8a4..60d4be9a 100644
--- a/src/CppParser/Bindings/CLI/CppParser.cpp
+++ b/src/CppParser/Bindings/CLI/CppParser.cpp
@@ -480,16 +480,6 @@ void CppSharp::Parser::CppParserOptions::Verbose::set(bool value)
     ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->verbose = value;
 }
 
-CppSharp::Parser::ParserTargetInfo^ CppSharp::Parser::CppParserOptions::TargetInfo::get()
-{
-    return (((::CppSharp::CppParser::CppParserOptions*)NativePtr)->targetInfo == nullptr) ? nullptr : gcnew CppSharp::Parser::ParserTargetInfo((::CppSharp::CppParser::ParserTargetInfo*)((::CppSharp::CppParser::CppParserOptions*)NativePtr)->targetInfo);
-}
-
-void CppSharp::Parser::CppParserOptions::TargetInfo::set(CppSharp::Parser::ParserTargetInfo^ value)
-{
-    ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->targetInfo = (::CppSharp::CppParser::ParserTargetInfo*)value->NativePtr;
-}
-
 unsigned int CppSharp::Parser::CppParserOptions::ArgumentsCount::get()
 {
     auto __ret = ((::CppSharp::CppParser::CppParserOptions*)NativePtr)->getArgumentsCount();
diff --git a/src/CppParser/Bindings/CLI/CppParser.h b/src/CppParser/Bindings/CLI/CppParser.h
index 2832a8e0..a390df07 100644
--- a/src/CppParser/Bindings/CLI/CppParser.h
+++ b/src/CppParser/Bindings/CLI/CppParser.h
@@ -186,12 +186,6 @@ namespace CppSharp
                 void set(bool);
             }
 
-            property CppSharp::Parser::ParserTargetInfo^ TargetInfo
-            {
-                CppSharp::Parser::ParserTargetInfo^ get();
-                void set(CppSharp::Parser::ParserTargetInfo^);
-            }
-
             property unsigned int ArgumentsCount
             {
                 unsigned int get();
diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
index aa5f94c4..c7095f99 100644
--- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17901,7 +17901,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 152)]
+            [StructLayout(LayoutKind.Explicit, Size = 148)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17958,9 +17958,6 @@ namespace CppSharp
                 [FieldOffset(147)]
                 internal byte verbose;
 
-                [FieldOffset(148)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -18491,24 +18488,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
index c5834ed2..92b4f229 100644
--- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17901,7 +17901,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 188)]
+            [StructLayout(LayoutKind.Explicit, Size = 184)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17958,9 +17958,6 @@ namespace CppSharp
                 [FieldOffset(183)]
                 internal byte verbose;
 
-                [FieldOffset(184)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.ThisCall,
                     EntryPoint="??0CppParserOptions@CppParser@CppSharp@@QAE@XZ")]
@@ -18491,24 +18488,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
index 80f412af..b8a0a018 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs
@@ -17900,7 +17900,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 296)]
+            [StructLayout(LayoutKind.Explicit, Size = 288)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17957,9 +17957,6 @@ namespace CppSharp
                 [FieldOffset(287)]
                 internal byte verbose;
 
-                [FieldOffset(288)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -18490,24 +18487,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
index 47fa71ee..94d81bb1 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs
@@ -17900,7 +17900,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 320)]
+            [StructLayout(LayoutKind.Explicit, Size = 312)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17957,9 +17957,6 @@ namespace CppSharp
                 [FieldOffset(311)]
                 internal byte verbose;
 
-                [FieldOffset(312)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -18490,24 +18487,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
index 5e7ab41f..4995fbb5 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs
@@ -17900,7 +17900,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 248)]
+            [StructLayout(LayoutKind.Explicit, Size = 240)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17957,9 +17957,6 @@ namespace CppSharp
                 [FieldOffset(239)]
                 internal byte verbose;
 
-                [FieldOffset(240)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="_ZN8CppSharp9CppParser16CppParserOptionsC2Ev")]
@@ -18490,24 +18487,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
index 6336e051..43831483 100644
--- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
+++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs
@@ -17901,7 +17901,7 @@ namespace CppSharp
 
         public unsafe partial class CppParserOptions : IDisposable
         {
-            [StructLayout(LayoutKind.Explicit, Size = 320)]
+            [StructLayout(LayoutKind.Explicit, Size = 312)]
             public partial struct __Internal
             {
                 [FieldOffset(0)]
@@ -17958,9 +17958,6 @@ namespace CppSharp
                 [FieldOffset(311)]
                 internal byte verbose;
 
-                [FieldOffset(312)]
-                internal global::System.IntPtr targetInfo;
-
                 [SuppressUnmanagedCodeSecurity]
                 [DllImport("CppSharp.CppParser.dll", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
                     EntryPoint="??0CppParserOptions@CppParser@CppSharp@@QEAA@XZ")]
@@ -18491,24 +18488,6 @@ namespace CppSharp
                 }
             }
 
-            public global::CppSharp.Parser.ParserTargetInfo TargetInfo
-            {
-                get
-                {
-                    global::CppSharp.Parser.ParserTargetInfo __result0;
-                    if (((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo == IntPtr.Zero) __result0 = null;
-                    else if (global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap.ContainsKey(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo))
-                        __result0 = (global::CppSharp.Parser.ParserTargetInfo) global::CppSharp.Parser.ParserTargetInfo.NativeToManagedMap[((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo];
-                    else __result0 = global::CppSharp.Parser.ParserTargetInfo.__CreateInstance(((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo);
-                    return __result0;
-                }
-
-                set
-                {
-                    ((global::CppSharp.Parser.CppParserOptions.__Internal*) __Instance)->targetInfo = ReferenceEquals(value, null) ? global::System.IntPtr.Zero : value.__Instance;
-                }
-            }
-
             public uint ArgumentsCount
             {
                 get
diff --git a/src/CppParser/CppParser.cpp b/src/CppParser/CppParser.cpp
index 2c13d76d..000408fb 100644
--- a/src/CppParser/CppParser.cpp
+++ b/src/CppParser/CppParser.cpp
@@ -18,7 +18,6 @@ CppParserOptions::CppParserOptions()
     , noBuiltinIncludes(false)
     , microsoftMode(false)
     , verbose(false)
-    , targetInfo(0)
 {
 }
 
diff --git a/src/CppParser/CppParser.h b/src/CppParser/CppParser.h
index 79273b37..385dd840 100644
--- a/src/CppParser/CppParser.h
+++ b/src/CppParser/CppParser.h
@@ -44,8 +44,6 @@ struct CS_API CppParserOptions
     bool noBuiltinIncludes;
     bool microsoftMode;
     bool verbose;
-
-    ParserTargetInfo* targetInfo;
 };
 
 enum class ParserDiagnosticLevel