diff --git a/src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceMapper.cs b/src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceMapper.cs
index 34c11a0..dc4585f 100644
--- a/src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceMapper.cs
+++ b/src/SharpIDE.Application/Features/SolutionDiscovery/VsPersistence/VsPersistenceMapper.cs
@@ -4,7 +4,7 @@ using Microsoft.VisualStudio.SolutionPersistence.Serializer;
 
 namespace SharpIDE.Application.Features.SolutionDiscovery.VsPersistence;
 
-public class VsPersistenceMapper
+public static class VsPersistenceMapper
 {
 	public static async Task<SharpIdeSolutionModel> GetSolutionModel(string solutionFilePath, CancellationToken cancellationToken = default)
 	{
@@ -40,7 +40,7 @@ public class VsPersistenceMapper
 			Projects = folderModel.Projects.Select(GetSharpIdeProjectModel).ToList()
 		};
 
-	public static async Task<IntermediateSolutionModel> GetIntermediateModel(string solutionFilePath,
+	private static async Task<IntermediateSolutionModel> GetIntermediateModel(string solutionFilePath,
 		CancellationToken cancellationToken = default)
 	{
 		var serializer = SolutionSerializers.GetSerializerByMoniker(solutionFilePath);
diff --git a/src/SharpIDE.Photino/Components/CodeViewer.razor b/src/SharpIDE.Photino/Components/CodeViewer.razor
index de214ab..f9f8403 100644
--- a/src/SharpIDE.Photino/Components/CodeViewer.razor
+++ b/src/SharpIDE.Photino/Components/CodeViewer.razor
@@ -23,7 +23,6 @@
     public string FilePath { get; set; } = null!;
 
 	private string? _fileContent;
-	private string? _unsavedFileContent;
 	private bool _unsavedEdits = false;
 
 	StandaloneCodeEditor _codeEditorRef = null!;
diff --git a/src/SharpIDE.Photino/Layout/MainLayout.razor b/src/SharpIDE.Photino/Layout/MainLayout.razor
index 6e950a8..eff190b 100644
--- a/src/SharpIDE.Photino/Layout/MainLayout.razor
+++ b/src/SharpIDE.Photino/Layout/MainLayout.razor
@@ -49,7 +49,7 @@
 		_solutionFilePath = solutionFilePath;
 
 		await BuildService.BuildSolutionAsync(_solutionFilePath);
-		var solutionModel = await RoslynTest.Analyse(_solutionFilePath);
+		var solutionModel = await VsPersistenceMapper.GetSolutionModel(_solutionFilePath);
 		_solutionModel = solutionModel;
 	}
 }