diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 79bfc671ef..b79db9f053 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -24,17 +24,14 @@
       <TabItem Header="DataGrid"><pages:DataGridPage/></TabItem>
       <TabItem Header="DatePicker"><pages:DatePickerPage/></TabItem>
       <TabItem Header="Drag+Drop"><pages:DragAndDropPage/></TabItem>
-      <TabItem Header="Ellipse"><pages:EllipsePage/></TabItem>
       <TabItem Header="Expander"><pages:ExpanderPage/></TabItem>
       <TabItem Header="Image"><pages:ImagePage/></TabItem>
       <TabItem Header="LayoutTransformControl"><pages:LayoutTransformControlPage/></TabItem>
-      <TabItem Header="Line"><pages:LinePage/></TabItem>
       <TabItem Header="ListBox"><pages:ListBoxPage/></TabItem>
       <TabItem Header="Menu"><pages:MenuPage/></TabItem>
 	  <TabItem Header="NumericUpDown"><pages:NumericUpDownPage/></TabItem>
       <TabItem Header="ProgressBar"><pages:ProgressBarPage/></TabItem>
       <TabItem Header="RadioButton"><pages:RadioButtonPage/></TabItem>
-      <TabItem Header="Rectangle"><pages:RectanglePage/></TabItem>
       <TabItem Header="Slider"><pages:SliderPage/></TabItem>
       <TabItem Header="TabControl"><pages:TabControlPage/></TabItem>
       <TabItem Header="TextBox"><pages:TextBoxPage/></TabItem>
diff --git a/samples/ControlCatalog/Pages/EllipsePage.xaml b/samples/ControlCatalog/Pages/EllipsePage.xaml
deleted file mode 100644
index f66cca9cdb..0000000000
--- a/samples/ControlCatalog/Pages/EllipsePage.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.EllipsePage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">Ellipse</TextBlock>
-    <TextBlock Classes="h2">A control which represents an ellipse with a fill and a stroke.</TextBlock>
-
-    <StackPanel Orientation="Vertical"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Spacing="16">
-      <Ellipse Width="200" Height="200" Fill="Red" Stroke="Blue" StrokeThickness="{Binding #StrokeThickness.Value}"/>
-
-      <Ellipse Width="200" Height="100" Fill="Red" Stroke="Blue" StrokeThickness="{Binding #StrokeThickness.Value}"/>
-
-      <Grid ColumnDefinitions="Auto,*">
-        <TextBlock Grid.Column="0" Text="Stroke thickness"/>
-        <Slider Grid.Column="1"  Name="StrokeThickness" Maximum="10" Value="1"/>
-      </Grid>
-      
-    </StackPanel>
-  </StackPanel>
-</UserControl>
diff --git a/samples/ControlCatalog/Pages/EllipsePage.xaml.cs b/samples/ControlCatalog/Pages/EllipsePage.xaml.cs
deleted file mode 100644
index e450e961ed..0000000000
--- a/samples/ControlCatalog/Pages/EllipsePage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace ControlCatalog.Pages
-{
-    public class EllipsePage : UserControl
-    {
-        public EllipsePage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}
diff --git a/samples/ControlCatalog/Pages/LinePage.xaml b/samples/ControlCatalog/Pages/LinePage.xaml
deleted file mode 100644
index 62ab917578..0000000000
--- a/samples/ControlCatalog/Pages/LinePage.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.LinePage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">Line</TextBlock>
-    <TextBlock Classes="h2">A control which represents a line.</TextBlock>
-
-    <StackPanel Orientation="Vertical"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Spacing="16">
-      <Line StartPoint="0,0" EndPoint="200,100" Stroke="Blue" StrokeThickness="{Binding #StrokeThickness.Value}"/>
-
-      <Grid ColumnDefinitions="Auto,*">
-        <TextBlock Grid.Column="0" Text="Stroke thickness"/>
-        <Slider Grid.Column="1"  Name="StrokeThickness" Maximum="10" Value="1"/>
-      </Grid>
-      
-    </StackPanel>
-  </StackPanel>
-</UserControl>
diff --git a/samples/ControlCatalog/Pages/LinePage.xaml.cs b/samples/ControlCatalog/Pages/LinePage.xaml.cs
deleted file mode 100644
index 43b8049d45..0000000000
--- a/samples/ControlCatalog/Pages/LinePage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace ControlCatalog.Pages
-{
-    public class LinePage : UserControl
-    {
-        public LinePage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}
diff --git a/samples/ControlCatalog/Pages/RectanglePage.xaml b/samples/ControlCatalog/Pages/RectanglePage.xaml
deleted file mode 100644
index 49701812c4..0000000000
--- a/samples/ControlCatalog/Pages/RectanglePage.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Class="ControlCatalog.Pages.RectanglePage">
-  <StackPanel Orientation="Vertical" Spacing="4">
-    <TextBlock Classes="h1">Rectangle</TextBlock>
-    <TextBlock Classes="h2">A control which represents a rectangle with a fill and a stroke.</TextBlock>
-
-    <StackPanel Orientation="Vertical"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Spacing="16">
-      <Rectangle Width="200" Height="32" Fill="Red" Stroke="Blue" StrokeThickness="{Binding #StrokeThickness.Value}"/>
-
-      <Grid ColumnDefinitions="Auto,*">
-          <TextBlock Grid.Column="0" Text="Stroke thickness"/>
-          <Slider Grid.Column="1"  Name="StrokeThickness" Maximum="10" Value="1"/>
-      </Grid>
-      
-    </StackPanel>
-  </StackPanel>
-</UserControl>
diff --git a/samples/ControlCatalog/Pages/RectanglePage.xaml.cs b/samples/ControlCatalog/Pages/RectanglePage.xaml.cs
deleted file mode 100644
index 0ee8a1a40f..0000000000
--- a/samples/ControlCatalog/Pages/RectanglePage.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace ControlCatalog.Pages
-{
-    public class RectanglePage : UserControl
-    {
-        public RectanglePage()
-        {
-            this.InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
-}