diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
deleted file mode 100644
index d80c2b9b68..0000000000
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Collections.Generic;
-using System.Globalization;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class InstrumentationPass : IntermediateNodePassBase, IRazorOptimizationPass
-    {
-        public override int Order => DefaultFeatureOrder;
-
-        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIntermediateNode documentNode)
-        {
-            if (documentNode.Options.DesignTime)
-            {
-                return;
-            }
-
-            var walker = new Visitor();
-            walker.VisitDocument(documentNode);
-
-            for (var i = 0; i < walker.Items.Count; i++)
-            {
-                var node = walker.Items[i];
-     
-                AddInstrumentation(node);
-            }
-        }
-
-        private static void AddInstrumentation(InstrumentationItem item)
-        {
-            var beginContextMethodName = "BeginContext"; // ORIGINAL: BeginContextMethodName
-            var endContextMethodName = "EndContext"; // ORIGINAL: EndContextMethodName
-
-            var beginNode = new CSharpCodeIntermediateNode();
-            beginNode.Children.Add(new IntermediateToken()
-            {
-                Kind = TokenKind.CSharp,
-                Content = string.Format("{0}({1}, {2}, {3});",
-                    beginContextMethodName,
-                    item.Source.AbsoluteIndex.ToString(CultureInfo.InvariantCulture),
-                    item.Source.Length.ToString(CultureInfo.InvariantCulture),
-                    item.IsLiteral ? "true" : "false")
-            });
-
-            var endNode = new CSharpCodeIntermediateNode();
-            endNode.Children.Add(new IntermediateToken()
-            {
-                Kind = TokenKind.CSharp,
-                Content = string.Format("{0}();", endContextMethodName)
-            });
-
-            var nodeIndex = item.Parent.Children.IndexOf(item.Node);
-            item.Parent.Children.Insert(nodeIndex, beginNode);
-            item.Parent.Children.Insert(nodeIndex + 2, endNode);
-        }
-
-        private struct InstrumentationItem
-        {
-            public InstrumentationItem(IntermediateNode node, IntermediateNode parent, bool isLiteral, SourceSpan source)
-            {
-                Node = node;
-                Parent = parent;
-                IsLiteral = isLiteral;
-                Source = source;
-            }
-
-            public IntermediateNode Node { get; }
-
-            public IntermediateNode Parent { get; }
-
-            public bool IsLiteral { get; }
-
-            public SourceSpan Source { get; }
-        }
-
-        private class Visitor : IntermediateNodeWalker
-        {
-            public List<InstrumentationItem> Items { get; } = new List<InstrumentationItem>();
-
-            public override void VisitHtml(HtmlContentIntermediateNode node)
-            {
-                if (node.Source != null)
-                {
-                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: true, source: node.Source.Value));
-                }
-
-                VisitDefault(node);
-            }
-
-            public override void VisitCSharpExpression(CSharpExpressionIntermediateNode node)
-            {
-                if (node.Source != null)
-                {
-                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: false, source: node.Source.Value));
-                }
-
-                VisitDefault(node);
-            }
-
-            public override void VisitTagHelper(TagHelperIntermediateNode node)
-            {
-                if (node.Source != null)
-                {
-                    Items.Add(new InstrumentationItem(node, Parent, isLiteral: false, source: node.Source.Value));
-                }
-
-                // Inside a tag helper we only want to visit inside of the body (skip all of the attributes and properties).
-                for (var i = 0; i < node.Children.Count; i++)
-                {
-                    var child = node.Children[i];
-                    if (child is TagHelperBodyIntermediateNode || 
-                        child is DefaultTagHelperBodyIntermediateNode)
-                    {
-                        VisitDefault(child);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
index ff5fcaad68..08c44425a8 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/RazorExtensions.cs
@@ -41,50 +41,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             builder.Features.Add(new RazorPageDocumentClassifierPass());
             builder.Features.Add(new MvcViewDocumentClassifierPass());
             builder.Features.Add(new AssemblyAttributeInjectionPass());
-            builder.Features.Add(new InstrumentationPass());
 
             builder.SetImportFeature(new MvcImportProjectFeature());
         }
-
-        #region Obsolete
-        [Obsolete("This method is obsolete and will be removed in a future version.")]
-        public static void Register(IRazorEngineBuilder builder)
-        {
-            if (builder == null)
-            {
-                throw new ArgumentNullException(nameof(builder));
-            }
-
-            InjectDirective.Register(builder);
-            ModelDirective.Register(builder);
-            NamespaceDirective.Register(builder);
-            PageDirective.Register(builder);
-
-            FunctionsDirective.Register(builder);
-            InheritsDirective.Register(builder);
-            SectionDirective.Register(builder);
-
-            builder.Features.Add(new DefaultTagHelperDescriptorProvider());
-            builder.Features.Add(new ViewComponentTagHelperDescriptorProvider());
-
-            builder.AddTargetExtension(new ViewComponentTagHelperTargetExtension());
-            builder.AddTargetExtension(new TemplateTargetExtension()
-            {
-                TemplateTypeName = "global::Microsoft.AspNetCore.Mvc.Razor.HelperResult",
-            });
-
-            builder.Features.Add(new ModelExpressionPass());
-            builder.Features.Add(new PagesPropertyInjectionPass());
-            builder.Features.Add(new ViewComponentTagHelperPass());
-            builder.Features.Add(new RazorPageDocumentClassifierPass());
-            builder.Features.Add(new MvcViewDocumentClassifierPass());
-
-            if (!builder.DesignTime)
-            {
-                builder.Features.Add(new AssemblyAttributeInjectionPass());
-                builder.Features.Add(new InstrumentationPass());
-            }
-        }
-        #endregion
     }
 }
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netcore.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json
new file mode 100644
index 0000000000..5f5b6444f6
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/breakingchanges.netframework.json
@@ -0,0 +1,11 @@
+[
+  {
+    "TypeId": "public static class Microsoft.AspNetCore.Mvc.Razor.Extensions.RazorExtensions",
+    "MemberId": "public static System.Void Register(Microsoft.AspNetCore.Razor.Language.IRazorEngineBuilder builder)",
+    "Kind": "Removal"
+  },
+  {
+    "TypeId": "public class Microsoft.AspNetCore.Mvc.Razor.Extensions.InstrumentationPass : Microsoft.AspNetCore.Razor.Language.IntermediateNodePassBase, Microsoft.AspNetCore.Razor.Language.IRazorOptimizationPass",
+    "Kind": "Removal"
+  }
+]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
deleted file mode 100644
index e9a1d5538a..0000000000
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Xunit;
-using static Microsoft.AspNetCore.Razor.Language.Intermediate.IntermediateNodeAssert;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
-{
-    public class InstrumentationPassTest
-    {
-        [Fact]
-        public void InstrumentationPass_NoOps_ForDesignTime()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDesignTimeDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new HtmlContentIntermediateNode());
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.Html,
-            });
-            builder.Pop();
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => IntermediateNodeAssert.Html("Hi", n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_InstrumentsHtml()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-
-            builder.Push(new HtmlContentIntermediateNode()
-            {
-                Source = CreateSource(1),
-            });
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.Html,
-                Source = CreateSource(1)
-            });
-            builder.Pop();
-            
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => BeginInstrumentation("1, 1, true", n),
-                n => IntermediateNodeAssert.Html("Hi", n),
-                n => EndInstrumentation(n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_SkipsHtml_WithoutLocation()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new HtmlContentIntermediateNode());
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.Html,
-            });
-            builder.Pop();
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => IntermediateNodeAssert.Html("Hi", n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_InstrumentsCSharpExpression()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new CSharpExpressionIntermediateNode()
-            {
-                Source = CreateSource(2),
-            });
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.CSharp,
-            });
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => BeginInstrumentation("2, 2, false", n),
-                n => CSharpExpression("Hi", n),
-                n => EndInstrumentation(n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_SkipsCSharpExpression_WithoutLocation()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new CSharpExpressionIntermediateNode());
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.CSharp,
-            });
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => CSharpExpression("Hi", n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperAttribute()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new TagHelperIntermediateNode());
-
-            builder.Push(new TagHelperHtmlAttributeIntermediateNode());
-
-            builder.Push(new CSharpExpressionIntermediateNode()
-            {
-                Source = CreateSource(5)
-            });
-
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.CSharp,
-            });
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n =>
-                {
-                    Assert.IsType<TagHelperIntermediateNode>(n);
-                    Children(
-                        n,
-                        c =>
-                        {
-                            Assert.IsType<TagHelperHtmlAttributeIntermediateNode>(c);
-                            Children(
-                                c,
-                                s => CSharpExpression("Hi", s));
-                        });
-                });
-        }
-
-        [Fact]
-        public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperProperty()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new TagHelperIntermediateNode());
-
-            builder.Push(new TagHelperPropertyIntermediateNode());
-
-            builder.Push(new CSharpExpressionIntermediateNode()
-            {
-                Source = CreateSource(5)
-            });
-
-            builder.Add(new IntermediateToken()
-            {
-                Content = "Hi",
-                Kind = TokenKind.CSharp,
-            });
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n =>
-                {
-                    Assert.IsType<TagHelperIntermediateNode>(n);
-                    Children(
-                        n,
-                        c =>
-                        {
-                            Assert.IsType<TagHelperPropertyIntermediateNode>(c);
-                            Children(
-                                c,
-                                s => CSharpExpression("Hi", s));
-                        });
-                });
-        }
-
-        [Fact]
-        public void InstrumentationPass_InstrumentsTagHelper()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Add(new TagHelperIntermediateNode()
-            {
-                Source = CreateSource(3),
-            });
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => BeginInstrumentation("3, 3, false", n),
-                n => Assert.IsType<TagHelperIntermediateNode>(n),
-                n => EndInstrumentation(n));
-        }
-
-        [Fact]
-        public void InstrumentationPass_SkipsTagHelper_WithoutLocation()
-        {
-            // Arrange
-            var document = new DocumentIntermediateNode()
-            {
-                Options = RazorCodeGenerationOptions.CreateDefault(),
-            };
-
-            var builder = IntermediateNodeBuilder.Create(document);
-            builder.Push(new TagHelperIntermediateNode());
-
-            var pass = new InstrumentationPass()
-            {
-                Engine = RazorProjectEngine.CreateEmpty().Engine,
-            };
-
-            // Act
-            pass.Execute(TestRazorCodeDocument.CreateEmpty(), document);
-
-            // Assert
-            Children(
-                document,
-                n => Assert.IsType<TagHelperIntermediateNode>(n));
-        }
-
-        private SourceSpan CreateSource(int number)
-        {
-            // The actual source span doesn't really matter, we just want to see the values used.
-            return new SourceSpan(new SourceLocation(number, number, number), number);
-        }
-    }
-}
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
deleted file mode 100644
index 2e312fa430..0000000000
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/IntegrationTests/InstrumentationPassIntegrationTest.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
-using Microsoft.AspNetCore.Razor.Language.IntegrationTests;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.IntegrationTests
-{
-    public class InstrumentationPassIntegrationTest : IntegrationTestBase
-    {
-        [Fact]
-        public void BasicTest()
-        {
-            // Arrange
-            var descriptors = new[]
-            {
-                CreateTagHelperDescriptor(
-                    tagName: "p",
-                    typeName: "PTagHelper",
-                    assemblyName: "TestAssembly"),
-                CreateTagHelperDescriptor(
-                    tagName: "form",
-                    typeName: "FormTagHelper",
-                    assemblyName: "TestAssembly"),
-                CreateTagHelperDescriptor(
-                    tagName: "input",
-                    typeName: "InputTagHelper",
-                    assemblyName: "TestAssembly",
-                    attributes: new Action<BoundAttributeDescriptorBuilder>[]
-                    {
-                        builder => builder
-                            .Name("value")
-                            .PropertyName("FooProp")
-                            .TypeName("System.String"),      // Gets preallocated
-                        builder => builder
-                            .Name("date")
-                            .PropertyName("BarProp")
-                            .TypeName("System.DateTime"),    // Doesn't get preallocated
-                    })
-            };
-
-            var engine = CreateProjectEngine(b =>
-            {
-                b.AddTagHelpers(descriptors);
-                b.Features.Add(new InstrumentationPass());
-                
-                // This test includes templates
-                b.AddTargetExtension(new TemplateTargetExtension());
-            });
-
-            var projectItem = CreateProjectItemFromFile();
-
-            // Act
-            var document = engine.Process(projectItem);
-
-            // Assert
-            AssertDocumentNodeMatchesBaseline(document.GetDocumentIntermediateNode());
-
-            var csharpDocument = document.GetCSharpDocument();
-            AssertCSharpDocumentMatchesBaseline(csharpDocument);
-            Assert.Empty(csharpDocument.Diagnostics);
-        }
-
-        private static TagHelperDescriptor CreateTagHelperDescriptor(
-            string tagName,
-            string typeName,
-            string assemblyName,
-            IEnumerable<Action<BoundAttributeDescriptorBuilder>> attributes = null)
-        {
-            var builder = TagHelperDescriptorBuilder.Create(typeName, assemblyName);
-            builder.TypeName(typeName);
-
-            if (attributes != null)
-            {
-                foreach (var attributeBuilder in attributes)
-                {
-                    builder.BoundAttributeDescriptor(attributeBuilder);
-                }
-            }
-
-            builder.TagMatchingRuleDescriptor(ruleBuilder => ruleBuilder.RequireTagName(tagName));
-
-            var descriptor = builder.Build();
-
-            return descriptor;
-        }
-    }
-}
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
index 8e6b1a7bd7..ec84263550 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(0, 4, true);
             WriteLiteral("<div");
-            EndContext();
             BeginWriteAttribute("class", " class=\"", 4, "\"", 28, 1);
 #line 1 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
@@ -29,28 +27,20 @@ WriteAttributeValue("", 12, this.ToString(), 12, 16, false);
 #line default
 #line hidden
             EndWriteAttribute();
-            BeginContext(29, 24, true);
             WriteLiteral(">\r\n    Hello world\r\n    ");
-            EndContext();
-            BeginContext(54, 29, false);
 #line 3 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
 Write(string.Format("{0}", "Hello"));
 
 #line default
 #line hidden
-            EndContext();
-            BeginContext(83, 10, true);
             WriteLiteral("\r\n</div>\r\n");
-            EndContext();
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
    
     var cls = "foo";
 
 #line default
 #line hidden
-            BeginContext(123, 2, true);
             WriteLiteral("<p");
-            EndContext();
             BeginWriteAttribute("class", " class=\"", 125, "\"", 158, 1);
             WriteAttributeValue("", 133, new Microsoft.AspNetCore.Mvc.Razor.HelperResult(async(__razor_attribute_value_writer) => {
                 PushWriter(__razor_attribute_value_writer);
@@ -59,13 +49,11 @@ Write(string.Format("{0}", "Hello"));
 
 #line default
 #line hidden
-                BeginContext(153, 3, false);
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                         Write(cls);
 
 #line default
 #line hidden
-                EndContext();
 #line 8 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic.cshtml"
                                   }
 
@@ -75,9 +63,7 @@ Write(string.Format("{0}", "Hello"));
             }
             ), 133, 25, false);
             EndWriteAttribute();
-            BeginContext(159, 5, true);
             WriteLiteral(" />\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
index 9173f6251b..8ed7912b0a 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_Runtime.ir.txt
@@ -13,62 +13,34 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_Basic - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(0, 4, true);
                 HtmlContent - (0:0,0 [4] Basic.cshtml)
                     IntermediateToken - (0:0,0 [4] Basic.cshtml) - Html - <div
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 HtmlAttribute - (4:0,4 [25] Basic.cshtml) -  class=" - "
                     CSharpExpressionAttributeValue - (12:0,12 [16] Basic.cshtml) - 
                         IntermediateToken - (13:0,13 [15] Basic.cshtml) - CSharp - this.ToString()
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(29, 24, true);
                 HtmlContent - (29:0,29 [24] Basic.cshtml)
                     IntermediateToken - (29:0,29 [1] Basic.cshtml) - Html - >
                     IntermediateToken - (30:0,30 [19] Basic.cshtml) - Html - \n    Hello world\n
                     IntermediateToken - (49:2,0 [4] Basic.cshtml) - Html -     
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(54, 29, false);
                 CSharpExpression - (54:2,5 [29] Basic.cshtml)
                     IntermediateToken - (54:2,5 [29] Basic.cshtml) - CSharp - string.Format("{0}", "Hello")
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(83, 10, true);
                 HtmlContent - (83:2,34 [10] Basic.cshtml)
                     IntermediateToken - (83:2,34 [2] Basic.cshtml) - Html - \n
                     IntermediateToken - (85:3,0 [6] Basic.cshtml) - Html - </div>
                     IntermediateToken - (91:3,6 [2] Basic.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - (95:4,2 [25] Basic.cshtml)
                     IntermediateToken - (95:4,2 [25] Basic.cshtml) - CSharp -  \n    var cls = "foo";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(123, 2, true);
                 HtmlContent - (123:7,0 [2] Basic.cshtml)
                     IntermediateToken - (123:7,0 [2] Basic.cshtml) - Html - <p
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 HtmlAttribute - (125:7,2 [34] Basic.cshtml) -  class=" - "
                     CSharpCodeAttributeValue - (133:7,10 [25] Basic.cshtml) - 
                         IntermediateToken - (134:7,11 [18] Basic.cshtml) - CSharp - if(cls != null) { 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(153, 3, false);
                         CSharpExpression - (153:7,30 [3] Basic.cshtml)
                             IntermediateToken - (153:7,30 [3] Basic.cshtml) - CSharp - cls
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                         IntermediateToken - (156:7,33 [2] Basic.cshtml) - CSharp -  }
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(159, 5, true);
                 HtmlContent - (159:7,36 [5] Basic.cshtml)
                     IntermediateToken - (159:7,36 [3] Basic.cshtml) - Html -  />
                     IntermediateToken - (162:7,39 [2] Basic.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
index 743eed291e..31179505bf 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.codegen.cs
@@ -19,33 +19,15 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(83, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(108, 5, true);
             WriteLiteral("\"\r\n\r\n");
-            EndContext();
-            BeginContext(119, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(128, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(139, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(149, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(176, 4, true);
             WriteLiteral("\r\n\r\n");
-            EndContext();
-            BeginContext(190, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(203, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
index bd3bdd87e2..0478bc1e74 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_Runtime.ir.txt
@@ -13,77 +13,41 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_IncompleteDirectives - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(83, 4, true);
                 HtmlContent - (83:0,83 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (83:0,83 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (94:3,0 [8] IncompleteDirectives.cshtml) - page
                 MalformedDirective - (102:4,0 [6] IncompleteDirectives.cshtml) - page
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(108, 5, true);
                 HtmlContent - (108:4,6 [5] IncompleteDirectives.cshtml)
                     IntermediateToken - (108:4,6 [5] IncompleteDirectives.cshtml) - Html - "\n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (113:6,0 [6] IncompleteDirectives.cshtml) - model
                     DirectiveToken - (119:6,6 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(119, 2, true);
                 HtmlContent - (119:6,6 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (119:6,6 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (121:7,0 [7] IncompleteDirectives.cshtml) - model
                     DirectiveToken - (128:7,7 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(128, 4, true);
                 HtmlContent - (128:7,7 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (128:7,7 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (132:9,0 [7] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (139:9,7 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(139, 2, true);
                 HtmlContent - (139:9,7 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (139:9,7 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (141:10,0 [8] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (149:10,8 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(149, 2, true);
                 HtmlContent - (149:10,8 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (149:10,8 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (151:11,0 [25] IncompleteDirectives.cshtml) - inject
                     DirectiveToken - (159:11,8 [17] IncompleteDirectives.cshtml) - MyService<TModel>
                     DirectiveToken - (176:11,25 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(176, 4, true);
                 HtmlContent - (176:11,25 [4] IncompleteDirectives.cshtml)
                     IntermediateToken - (176:11,25 [4] IncompleteDirectives.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (180:13,0 [10] IncompleteDirectives.cshtml) - namespace
                     DirectiveToken - (190:13,10 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(190, 2, true);
                 HtmlContent - (190:13,10 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (190:13,10 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 MalformedDirective - (192:14,0 [11] IncompleteDirectives.cshtml) - namespace
                     DirectiveToken - (203:14,11 [0] IncompleteDirectives.cshtml) - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(203, 2, true);
                 HtmlContent - (203:14,11 [2] IncompleteDirectives.cshtml)
                     IntermediateToken - (203:14,11 [2] IncompleteDirectives.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
index 2accba6951..2b269092bb 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(11, 5, true);
             WriteLiteral("Test.");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
index e99ab2d9c2..7a0583e5a0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_Runtime.ir.txt
@@ -14,12 +14,8 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InvalidNamespaceAtEOF - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 MalformedDirective - (0:0,0 [11] InvalidNamespaceAtEOF.cshtml) - namespace
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(11, 5, true);
                 HtmlContent - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml)
                     IntermediateToken - (11:0,11 [5] InvalidNamespaceAtEOF.cshtml) - Html - Test.
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
index 7835a2dae2..63b6c0a23e 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(6, 49, true);
             WriteLiteral("\"foo\r\n\r\n<h1>About Us</h1>\r\n<p>We are awesome.</p>");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
index 0692442d42..7a04b0051a 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_Runtime.ir.txt
@@ -14,8 +14,6 @@ Document -
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_MalformedPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 MalformedDirective - (0:0,0 [6] MalformedPageDirective.cshtml) - page
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(6, 49, true);
                 HtmlContent - (6:0,6 [49] MalformedPageDirective.cshtml)
                     IntermediateToken - (6:0,6 [8] MalformedPageDirective.cshtml) - Html - "foo\n\n
                     IntermediateToken - (14:2,0 [4] MalformedPageDirective.cshtml) - Html - <h1>
@@ -25,8 +23,6 @@ Document -
                     IntermediateToken - (33:3,0 [3] MalformedPageDirective.cshtml) - Html - <p>
                     IntermediateToken - (36:3,3 [15] MalformedPageDirective.cshtml) - Html - We are awesome.
                     IntermediateToken - (51:3,18 [4] MalformedPageDirective.cshtml) - Html - </p>
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
index 799bbc1362..d5ec95d2aa 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.codegen.cs
@@ -38,13 +38,8 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(17, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(64, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(66, 25, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             );
@@ -63,11 +58,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(91, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(93, 27, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
             }
             );
@@ -86,10 +77,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(120, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
index 1fb7820a75..0d8f3b8ec2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_Runtime.ir.txt
@@ -15,20 +15,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (17:1,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (64:3,0 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(66, 25, false);
                 TagHelper - (66:4,0 [25] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
@@ -39,16 +29,8 @@ Document -
                             IntermediateToken - (83:4,17 [4] ModelExpressionTagHelper.cshtml) - CSharp - Date
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(91, 2, true);
                 HtmlContent - (91:4,25 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (91:4,25 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(93, 27, false);
                 TagHelper - (93:5,0 [27] ModelExpressionTagHelper.cshtml) - input-test - TagMode.SelfClosing
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - InputTestTagHelper
@@ -58,14 +40,8 @@ Document -
                             IntermediateToken - (111:5,18 [5] ModelExpressionTagHelper.cshtml) - CSharp - Model
                             IntermediateToken -  - CSharp - )
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(120, 2, true);
                 HtmlContent - (120:5,27 [2] ModelExpressionTagHelper.cshtml)
                     IntermediateToken - (120:5,27 [2] ModelExpressionTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
index 9c1a5b03f5..729698a9cc 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace Test.Namespace
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(34, 20, true);
             WriteLiteral("<h1>Hi There!</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
index 53b89427ee..5be907ee1d 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_PageWithNamespace - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(34, 20, true);
                 HtmlContent - (34:2,0 [20] PageWithNamespace.cshtml)
                     IntermediateToken - (34:2,0 [4] PageWithNamespace.cshtml) - Html - <h1>
                     IntermediateToken - (38:2,4 [9] PageWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (47:2,13 [5] PageWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (52:2,18 [2] PageWithNamespace.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
index 107beef619..f69dce12eb 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(0, 28, true);
             WriteLiteral("<div>Some text here.</div>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
index 764b704909..42eb920742 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPageWithNoLeadingPageDirective - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(0, 28, true);
                 HtmlContent - (0:0,0 [28] RazorPageWithNoLeadingPageDirective.cshtml)
                     IntermediateToken - (0:0,0 [5] RazorPageWithNoLeadingPageDirective.cshtml) - Html - <div>
                     IntermediateToken - (5:0,5 [15] RazorPageWithNoLeadingPageDirective.cshtml) - Html - Some text here.
                     IntermediateToken - (20:0,20 [6] RazorPageWithNoLeadingPageDirective.cshtml) - Html - </div>
                     IntermediateToken - (26:0,26 [2] RazorPageWithNoLeadingPageDirective.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
index bff519edb2..83f08818fc 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.codegen.cs
@@ -25,25 +25,15 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(16, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(79, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(193, 19, true);
             WriteLiteral("\r\n<h1>New Customer ");
-            EndContext();
-            BeginContext(213, 10, false);
 #line 13 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
             Write(Model.Name);
 
 #line default
 #line hidden
-            EndContext();
-            BeginContext(223, 7, true);
             WriteLiteral("</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate.cshtml"
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
index 5d54680b90..c8fbdea2cc 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_Runtime.ir.txt
@@ -15,39 +15,19 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_RazorPagesWithRouteTemplate - global::Microsoft.AspNetCore.Mvc.RazorPages.Page - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(16, 2, true);
                 HtmlContent - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (16:1,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(79, 2, true);
                 HtmlContent - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (79:4,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(193, 19, true);
                 HtmlContent - (193:11,0 [19] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (193:11,0 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
                     IntermediateToken - (195:12,0 [4] RazorPagesWithRouteTemplate.cshtml) - Html - <h1>
                     IntermediateToken - (199:12,4 [13] RazorPagesWithRouteTemplate.cshtml) - Html - New Customer 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(213, 10, false);
                 CSharpExpression - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (213:12,18 [10] RazorPagesWithRouteTemplate.cshtml) - CSharp - Model.Name
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(223, 7, true);
                 HtmlContent - (223:12,28 [7] RazorPagesWithRouteTemplate.cshtml)
                     IntermediateToken - (223:12,28 [5] RazorPagesWithRouteTemplate.cshtml) - Html - </h1>
                     IntermediateToken - (228:12,33 [2] RazorPagesWithRouteTemplate.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml)
                 IntermediateToken - (93:5,12 [97] RazorPagesWithRouteTemplate.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
index f11c563667..2a42ce12f2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.codegen.cs
@@ -47,16 +47,9 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(7, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(81, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(381, 75, true);
             WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\">\r\n    ");
-            EndContext();
-            BeginContext(456, 31, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -70,30 +63,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(487, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(493, 237, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(517, 48, true);
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
-                EndContext();
-                BeginContext(566, 4, false);
 #line 25 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
                                          Write(Name);
 
 #line default
 #line hidden
-                EndContext();
-                BeginContext(570, 18, true);
                 WriteLiteral("</label>\r\n        ");
-                EndContext();
-                BeginContext(588, 130, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(611, 101, true);
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -106,10 +86,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(718, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -122,20 +99,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(730, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(736, 174, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(760, 10, true);
                 WriteLiteral("\r\n        ");
-                EndContext();
-                BeginContext(770, 128, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(809, 83, true);
                     WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -148,10 +116,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(898, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -164,10 +129,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(910, 11, true);
             WriteLiteral("\r\n</form>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 6 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel.cshtml"
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
index 519006aec3..ea80083dd2 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_Runtime.ir.txt
@@ -20,20 +20,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (7:1,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(81, 2, true);
                 HtmlContent - (81:4,0 [2] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (81:4,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(381, 75, true);
                 HtmlContent - (381:19,0 [75] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (381:19,0 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                     IntermediateToken - (383:20,0 [4] RazorPagesWithoutModel.cshtml) - Html - <h1>
@@ -45,55 +35,27 @@ Document -
                     IntermediateToken - (425:21,19 [24] RazorPagesWithoutModel.cshtml) - Html -  class="form-horizontal"
                     IntermediateToken - (449:21,43 [1] RazorPagesWithoutModel.cshtml) - Html - >
                     IntermediateToken - (450:21,44 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(456, 31, false);
                 TagHelper - (456:22,4 [31] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(487, 6, true);
                 HtmlContent - (487:22,35 [6] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (487:22,35 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(493, 237, false);
                 TagHelper - (493:23,4 [237] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(517, 48, true);
                         HtmlContent - (517:23,28 [48] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (517:23,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
                             IntermediateToken - (527:24,8 [6] RazorPagesWithoutModel.cshtml) - Html - <label
                             IntermediateToken - (533:24,14 [31] RazorPagesWithoutModel.cshtml) - Html -  class="col-md-2 control-label"
                             IntermediateToken - (564:24,45 [1] RazorPagesWithoutModel.cshtml) - Html - >
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(566, 4, false);
                         CSharpExpression - (566:24,47 [4] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (566:24,47 [4] RazorPagesWithoutModel.cshtml) - CSharp - Name
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(570, 18, true);
                         HtmlContent - (570:24,51 [18] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (570:24,51 [8] RazorPagesWithoutModel.cshtml) - Html - </label>
                             IntermediateToken - (578:24,59 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(588, 130, false);
                         TagHelper - (588:25,8 [130] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(611, 101, true);
                                 HtmlContent - (611:25,31 [101] RazorPagesWithoutModel.cshtml)
                                     IntermediateToken - (611:25,31 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (625:26,12 [6] RazorPagesWithoutModel.cshtml) - Html - <input
@@ -105,46 +67,22 @@ Document -
                                     IntermediateToken - (694:27,37 [1] RazorPagesWithoutModel.cshtml) - Html - >
                                     IntermediateToken - (695:27,38 [7] RazorPagesWithoutModel.cshtml) - Html - </span>
                                     IntermediateToken - (702:27,45 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(718, 6, true);
                         HtmlContent - (718:28,14 [6] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (718:28,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(730, 6, true);
                 HtmlContent - (730:29,10 [6] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (730:29,10 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(736, 174, false);
                 TagHelper - (736:30,4 [174] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(760, 10, true);
                         HtmlContent - (760:30,28 [10] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (760:30,28 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(770, 128, false);
                         TagHelper - (770:31,8 [128] RazorPagesWithoutModel.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(809, 83, true);
                                 HtmlContent - (809:31,47 [83] RazorPagesWithoutModel.cshtml)
                                     IntermediateToken - (809:31,47 [14] RazorPagesWithoutModel.cshtml) - Html - \n            
                                     IntermediateToken - (823:32,12 [7] RazorPagesWithoutModel.cshtml) - Html - <button
@@ -154,32 +92,18 @@ Document -
                                     IntermediateToken - (869:32,58 [4] RazorPagesWithoutModel.cshtml) - Html - Save
                                     IntermediateToken - (873:32,62 [9] RazorPagesWithoutModel.cshtml) - Html - </button>
                                     IntermediateToken - (882:32,71 [10] RazorPagesWithoutModel.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(898, 6, true);
                         HtmlContent - (898:33,14 [6] RazorPagesWithoutModel.cshtml)
                             IntermediateToken - (898:33,14 [6] RazorPagesWithoutModel.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(910, 11, true);
                 HtmlContent - (910:34,10 [11] RazorPagesWithoutModel.cshtml)
                     IntermediateToken - (910:34,10 [2] RazorPagesWithoutModel.cshtml) - Html - \n
                     IntermediateToken - (912:35,0 [7] RazorPagesWithoutModel.cshtml) - Html - </form>
                     IntermediateToken - (919:35,7 [2] RazorPagesWithoutModel.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (95:5,12 [283] RazorPagesWithoutModel.cshtml)
                 IntermediateToken - (95:5,12 [283] RazorPagesWithoutModel.cshtml) - CSharp - \n    public IActionResult OnPost(Customer customer)\n    {\n        Name = customer.Name;\n        return Redirect("~/customers/inlinepagemodels/");\n    }\n\n    public string Name { get; set; }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
index ca08b5e268..8f9b84f114 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.codegen.cs
@@ -47,16 +47,9 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(7, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(98, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(475, 76, true);
             WriteLiteral("\r\n<h1>New Customer</h1>\r\n<form method=\"post\" class=\"form-horizontal\" >\r\n    ");
-            EndContext();
-            BeginContext(551, 31, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -70,30 +63,17 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(582, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(588, 243, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(612, 48, true);
                 WriteLiteral("\r\n        <label class=\"col-md-2 control-label\">");
-                EndContext();
-                BeginContext(661, 10, false);
 #line 29 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
                                          Write(Model.Name);
 
 #line default
 #line hidden
-                EndContext();
-                BeginContext(671, 18, true);
                 WriteLiteral("</label>\r\n        ");
-                EndContext();
-                BeginContext(689, 130, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(712, 101, true);
                     WriteLiteral("\r\n            <input class=\"form-control\" />\r\n            <span class=\"text-danger\"></span>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -106,10 +86,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(819, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -122,20 +99,11 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(831, 6, true);
             WriteLiteral("\r\n    ");
-            EndContext();
-            BeginContext(837, 174, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                BeginContext(861, 10, true);
                 WriteLiteral("\r\n        ");
-                EndContext();
-                BeginContext(871, 128, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("div", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
-                    BeginContext(910, 83, true);
                     WriteLiteral("\r\n            <button type=\"submit\" class=\"btn btn-primary\">Save</button>\r\n        ");
-                    EndContext();
                 }
                 );
                 __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -148,10 +116,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(999, 6, true);
                 WriteLiteral("\r\n    ");
-                EndContext();
             }
             );
             __DivTagHelper = CreateTagHelper<global::DivTagHelper>();
@@ -164,10 +129,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
-            BeginContext(1011, 11, true);
             WriteLiteral("\r\n</form>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
 #line 7 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages.cshtml"
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
index cc1bc6f718..8c352308a0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_Runtime.ir.txt
@@ -20,20 +20,10 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::DivTagHelper - __DivTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(7, 2, true);
                 HtmlContent - (7:1,0 [2] RazorPages.cshtml)
                     IntermediateToken - (7:1,0 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(98, 2, true);
                 HtmlContent - (98:5,0 [2] RazorPages.cshtml)
                     IntermediateToken - (98:5,0 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(475, 76, true);
                 HtmlContent - (475:23,0 [76] RazorPages.cshtml)
                     IntermediateToken - (475:23,0 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (477:24,0 [4] RazorPages.cshtml) - Html - <h1>
@@ -45,55 +35,27 @@ Document -
                     IntermediateToken - (519:25,19 [24] RazorPages.cshtml) - Html -  class="form-horizontal"
                     IntermediateToken - (543:25,43 [2] RazorPages.cshtml) - Html -  >
                     IntermediateToken - (545:25,45 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(551, 31, false);
                 TagHelper - (551:26,4 [31] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_0
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(582, 6, true);
                 HtmlContent - (582:26,35 [6] RazorPages.cshtml)
                     IntermediateToken - (582:26,35 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(588, 243, false);
                 TagHelper - (588:27,4 [243] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(612, 48, true);
                         HtmlContent - (612:27,28 [48] RazorPages.cshtml)
                             IntermediateToken - (612:27,28 [10] RazorPages.cshtml) - Html - \n        
                             IntermediateToken - (622:28,8 [6] RazorPages.cshtml) - Html - <label
                             IntermediateToken - (628:28,14 [31] RazorPages.cshtml) - Html -  class="col-md-2 control-label"
                             IntermediateToken - (659:28,45 [1] RazorPages.cshtml) - Html - >
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(661, 10, false);
                         CSharpExpression - (661:28,47 [10] RazorPages.cshtml)
                             IntermediateToken - (661:28,47 [10] RazorPages.cshtml) - CSharp - Model.Name
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(671, 18, true);
                         HtmlContent - (671:28,57 [18] RazorPages.cshtml)
                             IntermediateToken - (671:28,57 [8] RazorPages.cshtml) - Html - </label>
                             IntermediateToken - (679:28,65 [10] RazorPages.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(689, 130, false);
                         TagHelper - (689:29,8 [130] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(712, 101, true);
                                 HtmlContent - (712:29,31 [101] RazorPages.cshtml)
                                     IntermediateToken - (712:29,31 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (726:30,12 [6] RazorPages.cshtml) - Html - <input
@@ -105,46 +67,22 @@ Document -
                                     IntermediateToken - (795:31,37 [1] RazorPages.cshtml) - Html - >
                                     IntermediateToken - (796:31,38 [7] RazorPages.cshtml) - Html - </span>
                                     IntermediateToken - (803:31,45 [10] RazorPages.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_1
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(819, 6, true);
                         HtmlContent - (819:32,14 [6] RazorPages.cshtml)
                             IntermediateToken - (819:32,14 [6] RazorPages.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(831, 6, true);
                 HtmlContent - (831:33,10 [6] RazorPages.cshtml)
                     IntermediateToken - (831:33,10 [6] RazorPages.cshtml) - Html - \n    
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(837, 174, false);
                 TagHelper - (837:34,4 [174] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(861, 10, true);
                         HtmlContent - (861:34,28 [10] RazorPages.cshtml)
                             IntermediateToken - (861:34,28 [10] RazorPages.cshtml) - Html - \n        
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(871, 128, false);
                         TagHelper - (871:35,8 [128] RazorPages.cshtml) - div - TagMode.StartTagAndEndTag
                             DefaultTagHelperBody - 
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - BeginContext(910, 83, true);
                                 HtmlContent - (910:35,47 [83] RazorPages.cshtml)
                                     IntermediateToken - (910:35,47 [14] RazorPages.cshtml) - Html - \n            
                                     IntermediateToken - (924:36,12 [7] RazorPages.cshtml) - Html - <button
@@ -154,32 +92,18 @@ Document -
                                     IntermediateToken - (970:36,58 [4] RazorPages.cshtml) - Html - Save
                                     IntermediateToken - (974:36,62 [9] RazorPages.cshtml) - Html - </button>
                                     IntermediateToken - (983:36,71 [10] RazorPages.cshtml) - Html - \n        
-                                CSharpCode - 
-                                    IntermediateToken -  - CSharp - EndContext();
                             DefaultTagHelperCreate -  - DivTagHelper
                             PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_3
                             DefaultTagHelperExecute - 
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - BeginContext(999, 6, true);
                         HtmlContent - (999:37,14 [6] RazorPages.cshtml)
                             IntermediateToken - (999:37,14 [6] RazorPages.cshtml) - Html - \n    
-                        CSharpCode - 
-                            IntermediateToken -  - CSharp - EndContext();
                     DefaultTagHelperCreate -  - DivTagHelper
                     PreallocatedTagHelperHtmlAttribute -  - __tagHelperAttribute_2
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(1011, 11, true);
                 HtmlContent - (1011:38,10 [11] RazorPages.cshtml)
                     IntermediateToken - (1011:38,10 [2] RazorPages.cshtml) - Html - \n
                     IntermediateToken - (1013:39,0 [7] RazorPages.cshtml) - Html - </form>
                     IntermediateToken - (1020:39,7 [2] RazorPages.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             CSharpCode - (112:6,12 [360] RazorPages.cshtml)
                 IntermediateToken - (112:6,12 [360] RazorPages.cshtml) - CSharp - \n    public class NewModel : PageModel\n    {\n        public IActionResult OnPost(Customer customer)\n        {\n            Name = customer.Name;\n            return Redirect("~/customers/inlinepagemodels/");\n        }\n\n        public string Name { get; set; }\n    }\n\n    public class Customer\n    {\n        public string Name { get; set; }\n    }\n
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
index 5d5ab480d6..9e809e0db5 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.codegen.cs
@@ -38,26 +38,17 @@ namespace AspNetCore
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(17, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(64, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
 #line 5 "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections.cshtml"
    
     Layout = "_SectionTestLayout.cshtml";
 
 #line default
 #line hidden
-            BeginContext(117, 26, true);
             WriteLiteral("\r\n<div>Some body</div>\r\n\r\n");
-            EndContext();
             DefineSection("Section1", async() => {
-                BeginContext(162, 43, true);
                 WriteLiteral("\r\n    <div>This is in Section 1</div>\r\n    ");
-                EndContext();
-                BeginContext(205, 25, false);
                 __tagHelperExecutionContext = __tagHelperScopeManager.Begin("input-test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.SelfClosing, "test", async() => {
                 }
                 );
@@ -76,10 +67,7 @@ __InputTestTagHelper.For = ModelExpressionProvider.CreateModelExpression(ViewDat
                 }
                 Write(__tagHelperExecutionContext.Output);
                 __tagHelperExecutionContext = __tagHelperScopeManager.End();
-                EndContext();
-                BeginContext(230, 2, true);
                 WriteLiteral("\r\n");
-                EndContext();
             }
             );
         }
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
index 8a5b810749..1309bc9423 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_Runtime.ir.txt
@@ -15,43 +15,25 @@ Document -
             DefaultTagHelperRuntime - 
             FieldDeclaration -  - private - global::InputTestTagHelper - __InputTestTagHelper
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(17, 2, true);
                 HtmlContent - (17:1,0 [2] Sections.cshtml)
                     IntermediateToken - (17:1,0 [2] Sections.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(64, 2, true);
                 HtmlContent - (64:3,0 [2] Sections.cshtml)
                     IntermediateToken - (64:3,0 [2] Sections.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 CSharpCode - (68:4,2 [46] Sections.cshtml)
                     IntermediateToken - (68:4,2 [46] Sections.cshtml) - CSharp -  \n    Layout = "_SectionTestLayout.cshtml";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(117, 26, true);
                 HtmlContent - (117:7,0 [26] Sections.cshtml)
                     IntermediateToken - (117:7,0 [2] Sections.cshtml) - Html - \n
                     IntermediateToken - (119:8,0 [5] Sections.cshtml) - Html - <div>
                     IntermediateToken - (124:8,5 [9] Sections.cshtml) - Html - Some body
                     IntermediateToken - (133:8,14 [6] Sections.cshtml) - Html - </div>
                     IntermediateToken - (139:8,20 [4] Sections.cshtml) - Html - \n\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
                 Section -  - Section1
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(162, 43, true);
                     HtmlContent - (162:10,19 [43] Sections.cshtml)
                         IntermediateToken - (162:10,19 [6] Sections.cshtml) - Html - \n    
                         IntermediateToken - (168:11,4 [5] Sections.cshtml) - Html - <div>
                         IntermediateToken - (173:11,9 [20] Sections.cshtml) - Html - This is in Section 1
                         IntermediateToken - (193:11,29 [6] Sections.cshtml) - Html - </div>
                         IntermediateToken - (199:11,35 [6] Sections.cshtml) - Html - \n    
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(205, 25, false);
                     TagHelper - (205:12,4 [25] Sections.cshtml) - input-test - TagMode.SelfClosing
                         DefaultTagHelperBody - 
                         DefaultTagHelperCreate -  - InputTestTagHelper
@@ -62,14 +44,8 @@ Document -
                                 IntermediateToken - (222:12,21 [4] Sections.cshtml) - CSharp - Date
                                 IntermediateToken -  - CSharp - )
                         DefaultTagHelperExecute - 
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - BeginContext(230, 2, true);
                     HtmlContent - (230:12,29 [2] Sections.cshtml)
                         IntermediateToken - (230:12,29 [2] Sections.cshtml) - Html - \n
-                    CSharpCode - 
-                        IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
index 28241f9687..f654e3766e 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -46,10 +46,7 @@ namespace AspNetCore
 
 #line default
 #line hidden
-            BeginContext(59, 2, true);
             WriteLiteral("\r\n");
-            EndContext();
-            BeginContext(61, 50, false);
             __tagHelperExecutionContext = __tagHelperScopeManager.Begin("vc:test", global::Microsoft.AspNetCore.Razor.TagHelpers.TagMode.StartTagAndEndTag, "test", async() => {
             }
             );
@@ -75,7 +72,6 @@ namespace AspNetCore
             }
             Write(__tagHelperExecutionContext.Output);
             __tagHelperExecutionContext = __tagHelperScopeManager.End();
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
index 4c215a09d3..c69014763c 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.ir.txt
@@ -19,14 +19,8 @@ Document -
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
                 CSharpCode - (30:1,2 [26] ViewComponentTagHelper.cshtml)
                     IntermediateToken - (30:1,2 [26] ViewComponentTagHelper.cshtml) - CSharp - \n    var foo = "Hello";\n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(59, 2, true);
                 HtmlContent - (59:4,0 [2] ViewComponentTagHelper.cshtml)
                     IntermediateToken - (59:4,0 [2] ViewComponentTagHelper.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(61, 50, false);
                 TagHelper - (61:5,0 [50] ViewComponentTagHelper.cshtml) - vc:test - TagMode.StartTagAndEndTag
                     DefaultTagHelperBody - 
                     DefaultTagHelperCreate -  - AllTagHelper
@@ -36,8 +30,6 @@ Document -
                             IntermediateToken - (83:5,22 [3] ViewComponentTagHelper.cshtml) - CSharp - foo
                     PreallocatedTagHelperProperty - (93:5,32 [6] ViewComponentTagHelper.cshtml) - __tagHelperAttribute_0 - bar - Bar
                     DefaultTagHelperExecute - 
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject - 
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
index fb4ec5e55e..ef6c311053 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.codegen.cs
@@ -19,9 +19,7 @@ namespace Test.Namespace
         #pragma warning disable 1998
         public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
-            BeginContext(27, 20, true);
             WriteLiteral("<h1>Hi There!</h1>\r\n");
-            EndContext();
         }
         #pragma warning restore 1998
         [global::Microsoft.AspNetCore.Mvc.Razor.Internal.RazorInjectAttribute]
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
index 471464c580..17f6801a03 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_Runtime.ir.txt
@@ -13,15 +13,11 @@ Document -
         RazorSourceChecksumAttribute - 
         ClassDeclaration -  - public - TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewWithNamespace - global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<dynamic> - 
             MethodDeclaration -  - public async override - global::System.Threading.Tasks.Task - ExecuteAsync
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - BeginContext(27, 20, true);
                 HtmlContent - (27:1,0 [20] ViewWithNamespace.cshtml)
                     IntermediateToken - (27:1,0 [4] ViewWithNamespace.cshtml) - Html - <h1>
                     IntermediateToken - (31:1,4 [9] ViewWithNamespace.cshtml) - Html - Hi There!
                     IntermediateToken - (40:1,13 [5] ViewWithNamespace.cshtml) - Html - </h1>
                     IntermediateToken - (45:1,18 [2] ViewWithNamespace.cshtml) - Html - \n
-                CSharpCode - 
-                    IntermediateToken -  - CSharp - EndContext();
             Inject - 
             Inject - 
             Inject -