diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index ad68c07caa1..36970c762bf 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -2302,7 +2302,7 @@ private static void GenerateMofForAst(TypeDefinitionAst typeAst, StringBuilder s
                 if (type != null)
                 {
                     ProcessMembers(type, sb, embeddedInstanceTypes, className);
-                    var t = type.GetTypeInfo().BaseType;
+                    var t = type.BaseType;
                     if (t != null)
                     {
                         bases.Enqueue(t);
@@ -2436,7 +2436,7 @@ private static void ProcessMembers(StringBuilder sb, List<object> embeddedInstan
                     mofType = MapTypeToMofType(memberType, member.Name, className, out isArrayType,
                         out embeddedInstanceType,
                         embeddedInstanceTypes);
-                    if (memberType.GetTypeInfo().IsEnum)
+                    if (memberType.IsEnum)
                     {
                         enumNames = Enum.GetNames(memberType);
                     }
@@ -2707,12 +2707,12 @@ private static bool IsSameNestedObject(CimClass oldClass, CimClass newClass)
         internal static string MapTypeToMofType(Type type, String memberName, String className, out bool isArrayType, out string embeddedInstanceType, List<object> embeddedInstanceTypes)
         {
             isArrayType = false;
-            if (type.GetTypeInfo().IsValueType)
+            if (type.IsValueType)
             {
                 type = Nullable.GetUnderlyingType(type) ?? type;
             }
 
-            if (type.GetTypeInfo().IsEnum)
+            if (type.IsEnum)
             {
                 embeddedInstanceType = null;
                 return "string";
@@ -2754,21 +2754,21 @@ internal static string MapTypeToMofType(Type type, String memberName, String cla
 
             bool supported = false;
             bool missingDefaultConstructor = false;
-            if (type.GetTypeInfo().IsValueType)
+            if (type.IsValueType)
             {
                 if (s_mapPrimitiveDotNetTypeToMof.ContainsKey(type))
                 {
                     supported = true;
                 }
             }
-            else if (!type.GetTypeInfo().IsAbstract)
+            else if (!type.IsAbstract)
             {
                 // Must have default constructor, at least 1 public property/field, and no base classes
                 if (type.GetConstructor(PSTypeExtensions.EmptyTypes) == null)
                 {
                     missingDefaultConstructor = true;
                 }
-                else if (type.GetTypeInfo().BaseType == typeof(object) &&
+                else if (type.BaseType == typeof(object) &&
                     (type.GetProperties(BindingFlags.Instance | BindingFlags.Public).Length > 0 ||
                          type.GetFields(BindingFlags.Instance | BindingFlags.Public).Length > 0))
                 {
@@ -2950,7 +2950,7 @@ private static void GenerateMofForType(Type type, StringBuilder sb, List<object>
             // Friendly name is required by module validator to verify resource instance against the exclusive resource name list.
             sb.AppendFormat(CultureInfo.InvariantCulture, "[ClassVersion(\"1.0.0\"), FriendlyName(\"{0}\")]\nclass {0}", className);
 
-            if (type.GetTypeInfo().GetCustomAttributes<DscResourceAttribute>().Any())
+            if (type.GetCustomAttributes<DscResourceAttribute>().Any())
             {
                 sb.Append(" : OMI_BaseResource");
             }
@@ -2992,7 +2992,7 @@ private static void ProcessMembers(Type type, StringBuilder sb, List<object> emb
                     embeddedInstanceTypes);
                 string arrayAffix = isArrayType ? "[]" : String.Empty;
 
-                var enumNames = memberType.GetTypeInfo().IsEnum
+                var enumNames = memberType.IsEnum
                     ? Enum.GetNames(memberType)
                     : null;
                 sb.AppendFormat(CultureInfo.InvariantCulture,
@@ -3015,7 +3015,7 @@ private static bool ImportKeywordsFromAssembly(PSModuleInfo module,
             var parser = new Microsoft.PowerShell.DesiredStateConfiguration.CimDSCParser(MyClassCallback);
 
             IEnumerable<Type> resourceDefinitions =
-                assembly.GetTypes().Where(t => t.GetTypeInfo().GetCustomAttributes<DscResourceAttribute>().Any());
+                assembly.GetTypes().Where(t => t.GetCustomAttributes<DscResourceAttribute>().Any());
 
             foreach (var r in resourceDefinitions)
             {
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
index 10a7fa9517b..5180d6a4ae7 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
@@ -131,8 +131,7 @@ internal ScriptWriter(
 
             string objectModelWrapperName = _cmdletizationMetadata.Class.CmdletAdapter ?? defaultObjectModelWrapper;
             _objectModelWrapper = (Type)LanguagePrimitives.ConvertTo(objectModelWrapperName, typeof(Type), CultureInfo.InvariantCulture);
-            TypeInfo objectModelWrapperTypeInfo = _objectModelWrapper.GetTypeInfo();
-            if (objectModelWrapperTypeInfo.IsGenericType)
+            if (_objectModelWrapper.IsGenericType)
             {
                 string message = string.Format(
                     CultureInfo.CurrentCulture,
@@ -141,10 +140,9 @@ internal ScriptWriter(
                 throw new XmlException(message);
             }
             Type baseType = _objectModelWrapper;
-            TypeInfo baseTypeInfo = objectModelWrapperTypeInfo;
-            while ((!baseTypeInfo.IsGenericType) || baseTypeInfo.GetGenericTypeDefinition() != typeof(CmdletAdapter<>))
+            while ((!baseType.IsGenericType) || baseType.GetGenericTypeDefinition() != typeof(CmdletAdapter<>))
             {
-                baseType = baseTypeInfo.BaseType;
+                baseType = baseType.BaseType;
                 if (baseType == typeof(object))
                 {
                     string message = string.Format(
@@ -154,7 +152,6 @@ internal ScriptWriter(
                         typeof(CmdletAdapter<>).FullName);
                     throw new XmlException(message);
                 }
-                baseTypeInfo = baseType.GetTypeInfo();
             }
             _objectInstanceType = baseType.GetGenericArguments()[0];
 
diff --git a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
index 465d83a93e6..9eabf7e9075 100644
--- a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
+++ b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
@@ -286,7 +286,7 @@ public override Collection<string> GetTypeNameHierarchy(object baseObject)
 
             if (baseObject != null)
             {
-                for (Type type = baseObject.GetType(); type != null; type = type.GetTypeInfo().BaseType)
+                for (Type type = baseObject.GetType(); type != null; type = type.BaseType)
                 {
                     result.Add(type.FullName);
                 }
diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
index 3251961b247..23be0ce9c8f 100644
--- a/src/System.Management.Automation/help/CommandHelpProvider.cs
+++ b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -471,7 +471,7 @@ private static string GetCmdletAssemblyPath(CmdletInfo cmdletInfo)
             if (cmdletInfo.ImplementingType == null)
                 return null;
 
-            return Path.GetDirectoryName(cmdletInfo.ImplementingType.GetTypeInfo().Assembly.Location);
+            return Path.GetDirectoryName(cmdletInfo.ImplementingType.Assembly.Location);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs b/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
index 9ef8f0e635e..f71660a37ff 100644
--- a/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
+++ b/src/System.Management.Automation/help/DefaultCommandHelpObjectBuilder.cs
@@ -306,19 +306,19 @@ private static void AddSyntaxParametersProperties(PSObject obj, IEnumerable<Comm
                 }
                 else
                 {
-                    if (parameter.ParameterType.GetTypeInfo().IsEnum && (Enum.GetNames(parameter.ParameterType) != null))
+                    if (parameter.ParameterType.IsEnum && (Enum.GetNames(parameter.ParameterType) != null))
                     {
                         AddParameterValueGroupProperties(mshObject, Enum.GetNames(parameter.ParameterType));
                     }
                     else if (parameter.ParameterType.IsArray)
                     {
-                        if (parameter.ParameterType.GetElementType().GetTypeInfo().IsEnum &&
+                        if (parameter.ParameterType.GetElementType().IsEnum &&
                             Enum.GetNames(parameter.ParameterType.GetElementType()) != null)
                         {
                             AddParameterValueGroupProperties(mshObject, Enum.GetNames(parameter.ParameterType.GetElementType()));
                         }
                     }
-                    else if (parameter.ParameterType.GetTypeInfo().IsGenericType)
+                    else if (parameter.ParameterType.IsGenericType)
                     {
                         Type[] types = parameter.ParameterType.GetGenericArguments();
 
@@ -326,13 +326,13 @@ private static void AddSyntaxParametersProperties(PSObject obj, IEnumerable<Comm
                         {
                             Type type = types[0];
 
-                            if (type.GetTypeInfo().IsEnum && (Enum.GetNames(type) != null))
+                            if (type.IsEnum && (Enum.GetNames(type) != null))
                             {
                                 AddParameterValueGroupProperties(mshObject, Enum.GetNames(type));
                             }
                             else if (type.IsArray)
                             {
-                                if (type.GetElementType().GetTypeInfo().IsEnum &&
+                                if (type.GetElementType().IsEnum &&
                                     Enum.GetNames(type.GetElementType()) != null)
                                 {
                                     AddParameterValueGroupProperties(mshObject, Enum.GetNames(type.GetElementType()));
diff --git a/src/System.Management.Automation/help/HelpCategoryInvalidException.cs b/src/System.Management.Automation/help/HelpCategoryInvalidException.cs
index bc0f3ce4703..373611818fe 100644
--- a/src/System.Management.Automation/help/HelpCategoryInvalidException.cs
+++ b/src/System.Management.Automation/help/HelpCategoryInvalidException.cs
@@ -55,7 +55,7 @@ public HelpCategoryInvalidException(string helpCategory, Exception innerExceptio
         private void CreateErrorRecord()
         {
             _errorRecord = new ErrorRecord(new ParentContainsErrorRecordException(this), "HelpCategoryInvalid", ErrorCategory.InvalidArgument, null);
-            _errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpCategoryInvalidException).GetTypeInfo().Assembly, "HelpErrors", "HelpCategoryInvalid", _helpCategory);
+            _errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpCategoryInvalidException).Assembly, "HelpErrors", "HelpCategoryInvalid", _helpCategory);
         }
 
         private ErrorRecord _errorRecord;
diff --git a/src/System.Management.Automation/help/HelpCommentsParser.cs b/src/System.Management.Automation/help/HelpCommentsParser.cs
index e527879eb31..e03c6201698 100644
--- a/src/System.Management.Automation/help/HelpCommentsParser.cs
+++ b/src/System.Management.Automation/help/HelpCommentsParser.cs
@@ -153,10 +153,9 @@ private XmlElement BuildXmlForParameter(
             if (type == null)
                 type = typeof(object);
 
-            var typeInfo = type.GetTypeInfo();
-            var elementType = typeInfo.IsArray ? typeInfo.GetElementType() : type;
+            var elementType = type.IsArray ? type.GetElementType() : type;
 
-            if (elementType.GetTypeInfo().IsEnum)
+            if (elementType.IsEnum)
             {
                 XmlElement parameterValueGroup = _doc.CreateElement("command:parameterValueGroup", commandURI);
                 foreach (string valueName in Enum.GetNames(elementType))
diff --git a/src/System.Management.Automation/help/HelpErrorTracer.cs b/src/System.Management.Automation/help/HelpErrorTracer.cs
index 41face7da16..9e68fba17e8 100644
--- a/src/System.Management.Automation/help/HelpErrorTracer.cs
+++ b/src/System.Management.Automation/help/HelpErrorTracer.cs
@@ -107,7 +107,7 @@ public void Dispose()
                 if (_helpTracer.HelpSystem.VerboseHelpErrors && _errors.Count > 0)
                 {
                     ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("Help Load Error"), "HelpLoadError", ErrorCategory.SyntaxError, null);
-                    errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpErrorTracer).GetTypeInfo().Assembly, "HelpErrors", "HelpLoadError", _helpFile, _errors.Count);
+                    errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpErrorTracer).Assembly, "HelpErrors", "HelpLoadError", _helpFile, _errors.Count);
                     _helpTracer.HelpSystem.LastErrors.Add(errorRecord);
 
                     foreach (ErrorRecord error in _errors)
diff --git a/src/System.Management.Automation/help/HelpNotFoundException.cs b/src/System.Management.Automation/help/HelpNotFoundException.cs
index a1152431559..bf0cc48fc0e 100644
--- a/src/System.Management.Automation/help/HelpNotFoundException.cs
+++ b/src/System.Management.Automation/help/HelpNotFoundException.cs
@@ -60,7 +60,7 @@ private void CreateErrorRecord()
             // Don't do ParentContainsErrorRecordException(this), as this causes recursion, and creates a
             // segmentation fault on Linux
             _errorRecord = new ErrorRecord(new ParentContainsErrorRecordException(errMessage), "HelpNotFound", ErrorCategory.ResourceUnavailable, null);
-            _errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpNotFoundException).GetTypeInfo().Assembly, "HelpErrors", "HelpNotFound", _helpTopic);
+            _errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpNotFoundException).Assembly, "HelpErrors", "HelpNotFound", _helpTopic);
         }
 
         private ErrorRecord _errorRecord;
diff --git a/src/System.Management.Automation/help/HelpProvider.cs b/src/System.Management.Automation/help/HelpProvider.cs
index 86b5fe042ae..57cb978f5d2 100644
--- a/src/System.Management.Automation/help/HelpProvider.cs
+++ b/src/System.Management.Automation/help/HelpProvider.cs
@@ -214,7 +214,7 @@ internal virtual void Reset()
         internal void ReportHelpFileError(Exception exception, string target, string helpFile)
         {
             ErrorRecord errorRecord = new ErrorRecord(exception, "LoadHelpFileForTargetFailed", ErrorCategory.OpenError, null);
-            errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpProvider).GetTypeInfo().Assembly, "HelpErrors", "LoadHelpFileForTargetFailed", target, helpFile, exception.Message);
+            errorRecord.ErrorDetails = new ErrorDetails(typeof(HelpProvider).Assembly, "HelpErrors", "LoadHelpFileForTargetFailed", target, helpFile, exception.Message);
             this.HelpSystem.LastErrors.Add(errorRecord);
             return;
         }
diff --git a/src/System.Management.Automation/help/MamlNode.cs b/src/System.Management.Automation/help/MamlNode.cs
index e49177a6e27..a63dd1654d8 100644
--- a/src/System.Management.Automation/help/MamlNode.cs
+++ b/src/System.Management.Automation/help/MamlNode.cs
@@ -681,7 +681,7 @@ private int GetParaMamlNodeCount(XmlNodeList nodes)
         private void WriteMamlInvalidChildNodeError(XmlNode node, XmlNode childNode)
         {
             ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("MamlInvalidChildNodeError"), "MamlInvalidChildNodeError", ErrorCategory.SyntaxError, null);
-            errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).GetTypeInfo().Assembly, "HelpErrors", "MamlInvalidChildNodeError", node.LocalName, childNode.LocalName, GetNodePath(node));
+            errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).Assembly, "HelpErrors", "MamlInvalidChildNodeError", node.LocalName, childNode.LocalName, GetNodePath(node));
             this.Errors.Add(errorRecord);
         }
 
@@ -694,7 +694,7 @@ private void WriteMamlInvalidChildNodeError(XmlNode node, XmlNode childNode)
         private void WriteMamlInvalidChildNodeCountError(XmlNode node, string childNodeName, int count)
         {
             ErrorRecord errorRecord = new ErrorRecord(new ParentContainsErrorRecordException("MamlInvalidChildNodeCountError"), "MamlInvalidChildNodeCountError", ErrorCategory.SyntaxError, null);
-            errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).GetTypeInfo().Assembly, "HelpErrors", "MamlInvalidChildNodeCountError", node.LocalName, childNodeName, count, GetNodePath(node));
+            errorRecord.ErrorDetails = new ErrorDetails(typeof(MamlNode).Assembly, "HelpErrors", "MamlInvalidChildNodeCountError", node.LocalName, childNodeName, count, GetNodePath(node));
             this.Errors.Add(errorRecord);
         }
 
diff --git a/src/System.Management.Automation/help/ProviderHelpProvider.cs b/src/System.Management.Automation/help/ProviderHelpProvider.cs
index 6465b300882..2f0330dee26 100644
--- a/src/System.Management.Automation/help/ProviderHelpProvider.cs
+++ b/src/System.Management.Automation/help/ProviderHelpProvider.cs
@@ -82,7 +82,7 @@ internal override IEnumerable<HelpInfo> ExactMatchHelp(HelpRequest helpRequest)
                 if (this.HelpSystem.LastHelpCategory == HelpCategory.Provider)
                 {
                     ErrorRecord errorRecord = new ErrorRecord(e, "ProviderLoadError", ErrorCategory.ResourceUnavailable, null);
-                    errorRecord.ErrorDetails = new ErrorDetails(typeof(ProviderHelpProvider).GetTypeInfo().Assembly, "HelpErrors", "ProviderLoadError", helpRequest.Target, e.Message);
+                    errorRecord.ErrorDetails = new ErrorDetails(typeof(ProviderHelpProvider).Assembly, "HelpErrors", "ProviderLoadError", helpRequest.Target, e.Message);
                     this.HelpSystem.LastErrors.Add(errorRecord);
                 }
             }
@@ -126,7 +126,7 @@ private static string GetProviderAssemblyPath(ProviderInfo providerInfo)
             if (providerInfo.ImplementingType == null)
                 return null;
 
-            return Path.GetDirectoryName(providerInfo.ImplementingType.GetTypeInfo().Assembly.Location);
+            return Path.GetDirectoryName(providerInfo.ImplementingType.Assembly.Location);
         }
 
         /// <summary>