diff --git a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
index f69d9e7bf..eef9f0dd5 100644
--- a/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
+++ b/src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugView.xaml
@@ -54,10 +54,7 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
         </Grid>
-        <TreeView Grid.Row="1"
-                  ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch"
-                  VirtualizingStackPanel.IsVirtualizing="True"
-                  VirtualizingStackPanel.VirtualizationMode="Recycling">
+        <TreeView Grid.Row="1" ItemsSource="{Binding MainDataModel.Children}" HorizontalContentAlignment="Stretch">
             <TreeView.Resources>
                 <Style TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource MaterialDesignTreeViewItem}">
                     <Setter Property="IsExpanded" Value="{Binding IsVisualizationExpanded, Mode=TwoWay}" />
@@ -117,21 +114,7 @@
                         </TextBlock>
 
                         <!-- Value display -->
-                        <TextBlock Grid.Column="2"
-                                   Text="{Binding DisplayValue, Mode=OneWay}"
-                                   FontFamily="Consolas"
-                                   HorizontalAlignment="Right"
-                                   Visibility="{Binding ShowToString, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
-                        <TextBlock Grid.Column="2"
-                                   Text="null"
-                                   FontFamily="Consolas"
-                                   HorizontalAlignment="Right"
-                                   Foreground="{DynamicResource MaterialDesignCheckBoxDisabled}"
-                                   Visibility="{Binding ShowNull, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
-                        <ContentControl Grid.Column="2"
-                                        s:View.Model="{Binding DisplayViewModel}"
-                                        FontFamily="Consolas"
-                                        Visibility="{Binding ShowViewModel, Converter={x:Static s:BoolToVisibilityConverter.Instance}, Mode=OneWay}" />
+                        <ContentControl Grid.Column="2" s:View.Model="{Binding DisplayViewModel}" FontFamily="Consolas" />
                     </Grid>
                 </HierarchicalDataTemplate>
                 <HierarchicalDataTemplate DataType="{x:Type dataModel:DataModelListPropertiesViewModel}" ItemsSource="{Binding Children}">