diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml b/SampleApps/AvaloniaApp/MainWindow.axaml
index cba1643d..352aa285 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml
@@ -64,10 +64,7 @@
             <map:MapItemsControl ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin}"
                                  SelectionMode="Multiple"
-                                 SelectionChanged="MapItemsControlSelectionChanged"
-                                 PointerPressed="MapItemsControl_PointerPressed"
-                                 PointerReleased="MapItemsControl_PointerReleased"
-                                 Tapped="MapItemsControl_Tapped">
+                                 SelectionChanged="MapItemsControlSelectionChanged">
                 <map:MapItemsControl.Styles>
                     <Style Selector="map|MapItem">
                         <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
diff --git a/SampleApps/AvaloniaApp/MainWindow.axaml.cs b/SampleApps/AvaloniaApp/MainWindow.axaml.cs
index 470bd969..3e3b20a4 100644
--- a/SampleApps/AvaloniaApp/MainWindow.axaml.cs
+++ b/SampleApps/AvaloniaApp/MainWindow.axaml.cs
@@ -12,7 +12,7 @@ namespace SampleApplication
     {
         public MainWindow()
         {
-            TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
             Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
 
             InitializeComponent();
@@ -140,20 +140,5 @@ namespace SampleApplication
 
             return string.Format(CultureInfo.InvariantCulture, "\n   {0:" + distanceFormat + "} {1}", distance, unit);
         }
-
-        private void MapItemsControl_PointerPressed(object sender, Avalonia.Input.PointerPressedEventArgs e)
-        {
-            Debug.WriteLine("PointerPressed");
-        }
-
-        private void MapItemsControl_PointerReleased(object sender, Avalonia.Input.PointerReleasedEventArgs e)
-        {
-            Debug.WriteLine("PointerReleased");
-        }
-
-        private void MapItemsControl_Tapped(object sender, Avalonia.Input.TappedEventArgs e)
-        {
-            Debug.WriteLine("Tapped");
-        }
     }
 }
diff --git a/SampleApps/UniversalApp/MainPage.xaml.cs b/SampleApps/UniversalApp/MainPage.xaml.cs
index 933456ff..9101773e 100644
--- a/SampleApps/UniversalApp/MainPage.xaml.cs
+++ b/SampleApps/UniversalApp/MainPage.xaml.cs
@@ -15,7 +15,7 @@ namespace SampleApplication
     {
         public MainPage()
         {
-            TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
 
             InitializeComponent();
             AddTestLayers();
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index 35556873..7058a81f 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -164,11 +164,7 @@
                                  SelectedItem="{Binding SelectedPushpin, Mode=TwoWay}"
                                  SelectionMode="Extended"
                                  LocationMemberPath="Location"
-                                 SelectionChanged="MapItemsControlSelectionChanged"
-                                 PointerPressed="MapItemsControl_PointerPressed"
-                                 PointerReleased="MapItemsControl_PointerReleased"
-                                 Tapped="MapItemsControl_Tapped"
-                                 RightTapped="MapItemsControl_RightTapped"/>
+                                 SelectionChanged="MapItemsControlSelectionChanged"/>
 
             <map:MapPath Location="53.5,8.2" Stroke="Blue" StrokeThickness="3" Fill="#1F007F00" IsHitTestVisible="False">
                 <map:MapPath.Data>
diff --git a/SampleApps/WinUiApp/MainWindow.xaml.cs b/SampleApps/WinUiApp/MainWindow.xaml.cs
index 9583a4d4..b9e39259 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml.cs
+++ b/SampleApps/WinUiApp/MainWindow.xaml.cs
@@ -15,7 +15,7 @@ namespace SampleApplication
     {
         public MainWindow()
         {
-            TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
             //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
             Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
 
@@ -148,25 +148,5 @@ namespace SampleApplication
 
             return string.Format(CultureInfo.InvariantCulture, "\n   {0:" + distanceFormat + "} {1}", distance, unit);
         }
-
-        private void MapItemsControl_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            Debug.WriteLine("MapItemsControl_Tapped");
-        }
-
-        private void MapItemsControl_RightTapped(object sender, RightTappedRoutedEventArgs e)
-        {
-            Debug.WriteLine("MapItemsControl_RightTapped");
-        }
-
-        private void MapItemsControl_PointerPressed(object sender, PointerRoutedEventArgs e)
-        {
-            Debug.WriteLine("MapItemsControl_PointerPressed");
-        }
-
-        private void MapItemsControl_PointerReleased(object sender, PointerRoutedEventArgs e)
-        {
-            Debug.WriteLine("MapItemsControl_PointerReleased");
-        }
     }
 }
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 623b2e24..331d41f2 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -136,19 +136,7 @@
                                  ItemsSource="{Binding Pushpins}"
                                  SelectedItem="{Binding SelectedPushpin}"
                                  SelectionMode="Extended"
-                                 SelectionChanged="MapItemsControlSelectionChanged"
-                                 PreviewMouseLeftButtonDown="MapItemsControl_PreviewMouseLeftButtonDown"
-                                 PreviewMouseLeftButtonUp="MapItemsControl_PreviewMouseLeftButtonUp"
-                                 PreviewMouseRightButtonDown="MapItemsControl_PreviewMouseRightButtonDown"
-                                 PreviewMouseRightButtonUp="MapItemsControl_PreviewMouseRightButtonUp"
-                                 PreviewTouchDown="MapItemsControl_PreviewTouchDown"
-                                 PreviewTouchUp="MapItemsControl_PreviewTouchUp"
-                                 MouseLeftButtonDown="MapItemsControl_MouseLeftButtonDown"
-                                 MouseLeftButtonUp="MapItemsControl_MouseLeftButtonUp"
-                                 MouseRightButtonDown="MapItemsControl_MouseRightButtonDown"
-                                 MouseRightButtonUp="MapItemsControl_MouseRightButtonUp"
-                                 TouchDown="MapItemsControl_TouchDown"
-                                 TouchUp="MapItemsControl_TouchUp"/>
+                                 SelectionChanged="MapItemsControlSelectionChanged"/>
 
             <map:Pushpin AutoCollapse="True" Location="65,-18" Content="Iceland"/>
             <map:Pushpin AutoCollapse="True" Location="71,25" Content="Norway"/>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index ddc27588..9f5b3a7e 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -14,7 +14,7 @@ namespace SampleApplication
         public MainWindow()
         {
             //TileImageLoader.Cache = new MapControl.Caching.ImageFileCache(TileImageLoader.DefaultCacheFolder);
-            TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
+            //TileImageLoader.Cache = new MapControl.Caching.SQLiteCache(TileImageLoader.DefaultCacheFolder);
             //TileImageLoader.Cache = new MapControl.Caching.FileDbCache(TileImageLoader.DefaultCacheFolder);
 
             Closed += (s, e) => (TileImageLoader.Cache as IDisposable)?.Dispose();
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index aa32ed13..e1590950 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -30,8 +30,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Caches\FileDbCache\FileDbCache.csproj" />
-        <ProjectReference Include="..\..\Caches\SQLiteCache\SQLiteCache.csproj" />
         <ProjectReference Include="..\..\MapUiTools\WPF\MapUiTools.WPF.csproj" />
     </ItemGroup>
 </Project>