diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 4daefef30a..df91c6241e 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Data.SQLite
         /// <param name="dbconnect">connect string</param>
         override public void Initialise(string dbconnect)
         {
-            DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAssetData).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
             if (dbconnect.Length == 0)
             {
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
index 8c7872ac87..13f2f03e29 100644
--- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Data.SQLite
 
             if (!m_initialized)
             {
-                DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAuthenticationData).Assembly);
+                DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
                 m_Connection = new SqliteConnection(connectionString);
                 m_Connection.Open();
diff --git a/OpenSim/Data/SQLite/SQLiteEstateData.cs b/OpenSim/Data/SQLite/SQLiteEstateData.cs
index e40ad9b7c1..42c647a647 100644
--- a/OpenSim/Data/SQLite/SQLiteEstateData.cs
+++ b/OpenSim/Data/SQLite/SQLiteEstateData.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Data.SQLite
 
         public void Initialise(string connectionString)
         {
-            DllmapConfigHelper.RegisterAssembly(typeof(SQLiteEstateStore).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
             m_connectionString = connectionString;
 
diff --git a/OpenSim/Data/SQLite/SQLiteFramework.cs b/OpenSim/Data/SQLite/SQLiteFramework.cs
index bac590f9fb..1111d7ddce 100644
--- a/OpenSim/Data/SQLite/SQLiteFramework.cs
+++ b/OpenSim/Data/SQLite/SQLiteFramework.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Data.SQLite
 
         protected SQLiteFramework(string connectionString)
         {
-            DllmapConfigHelper.RegisterAssembly(typeof(SQLiteFramework).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
         }
 
         //////////////////////////////////////////////////////////////
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 4f21cb4711..0d6d3e0e73 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Data.SQLite
         {
             try
             {
-                DllmapConfigHelper.RegisterAssembly(typeof(SQLiteSimulationData).Assembly);
+                DllmapConfigHelper. RegisterAssembly(typeof(SqliteConnection).Assembly);
 
                 m_connectionString = connectionString;
 
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 95f3e7a141..288c73a27b 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Data.SQLite
 
         public void Initialise(string connectionString)
         {
-            DllmapConfigHelper.RegisterAssembly(typeof(SQLiteUserProfilesData).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
             m_connectionString = connectionString;
 
diff --git a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
index 6747233cf5..4992e73828 100644
--- a/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
+++ b/OpenSim/Data/SQLite/SQLiteXInventoryData.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Data.SQLite
 
         public SQLiteXInventoryData(string conn, string realm)
         {
-            DllmapConfigHelper.RegisterAssembly(typeof(SQLiteXInventoryData).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
             m_Folders = new SqliteFolderHandler(
                     conn, "inventoryfolders", "XInventoryStore");
diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
index b7d8c37c30..9af5c3ed8c 100644
--- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.UserStatistics
             if (!enabled)
                 return;
 
-            DllmapConfigHelper.RegisterAssembly(typeof(WebStatsModule).Assembly);
+            DllmapConfigHelper.RegisterAssembly(typeof(SqliteConnection).Assembly);
 
             //IConfig startupConfig = config.Configs["Startup"];
 
diff --git a/bin/OpenSim.Data.SQLite.dll.config b/bin/OpenSim.Data.SQLite.dll.config
deleted file mode 100644
index 0266cd56c8..0000000000
--- a/bin/OpenSim.Data.SQLite.dll.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration>
-  <dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
-  <dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
-  <dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
-</configuration>
diff --git a/bin/OpenSim.Region.OptionalModules.dll.config b/bin/OpenSim.Region.OptionalModules.dll.config
deleted file mode 100644
index 0266cd56c8..0000000000
--- a/bin/OpenSim.Region.OptionalModules.dll.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<configuration>
-  <dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
-  <dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
-  <dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
-  <dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
-  <dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
-</configuration>