diff --git a/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj b/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj
index fac7392f..d83e240c 100644
--- a/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj
+++ b/Src/SharpArch.Infrastructure/SharpArch.Infrastructure.csproj
@@ -32,9 +32,5 @@
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Caching\" />
-  </ItemGroup>
-
 
 </Project>
diff --git a/Src/SharpArch.NHibernate/NHibernateSessionFactoryBuilder.cs b/Src/SharpArch.NHibernate/NHibernateSessionFactoryBuilder.cs
index 72ccedab..da4ae0ad 100644
--- a/Src/SharpArch.NHibernate/NHibernateSessionFactoryBuilder.cs
+++ b/Src/SharpArch.NHibernate/NHibernateSessionFactoryBuilder.cs
@@ -31,10 +31,9 @@ public class NHibernateSessionFactoryBuilder
         /// <summary>
         ///     Default NHibernate session factory key.
         /// </summary>
-        public static readonly string DefaultConfigurationName = "nhibernate.current_session";
+        [NotNull] public static readonly string DefaultConfigurationName = "nhibernate.current_session";
 
         readonly List<Assembly> _mappingAssemblies;
-        List<string> _additionalDependencies;
 
         AutoPersistenceModel _autoPersistenceModel;
         string _configFile;
@@ -67,16 +66,6 @@ public ISessionFactory BuildSessionFactory()
         /// <summary>
         ///     Builds NHibernate configuration.
         /// </summary>
-        /// <remarks>
-        ///     <para>
-        ///         Any changes made to configuration object after this point <b>will not be persisted</b> in configuration cache.
-        ///         This can be useful to make dynamic changes to configuration or in case changes cannot be serialized
-        ///         (e.g. event listeners are not marked with <see cref="System.SerializableAttribute" />.
-        ///     </para>
-        ///     <para>
-        ///         To make persistent changes use <seealso cref="ExposeConfiguration" />.
-        ///     </para>
-        /// </remarks>
         /// <exception cref="InvalidOperationException">No dependencies were specified</exception>
         [NotNull]
         public Configuration BuildConfiguration()