diff --git a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
index ffaaecb031..275ce4707c 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLDatabaseMapper.cs
@@ -2,6 +2,7 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 // using TribalMedia.Framework.Data;
 
+/*
 namespace OpenSim.Framework.Data.MySQL
 {
     public class MySQLDatabaseMapper : OpenSimDatabaseConnector
@@ -23,3 +24,4 @@ namespace OpenSim.Framework.Data.MySQL
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimDataReader.cs b/OpenSim/Framework/Data/OpenSimDataReader.cs
index 518cdc9743..c7b6470c52 100644
--- a/OpenSim/Framework/Data/OpenSimDataReader.cs
+++ b/OpenSim/Framework/Data/OpenSimDataReader.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Text;
 using libsecondlife;
+
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -37,3 +39,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
index ec80488568..155bdc12f0 100644
--- a/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
+++ b/OpenSim/Framework/Data/OpenSimDatabaseConnector.cs
@@ -1,5 +1,6 @@
 using System.Data;
 using libsecondlife;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -26,3 +27,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
index 103de2d616..8d5b9cf4a9 100644
--- a/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimObjectFieldMapper.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data.Common;
 using System.Text;
 using libsecondlife;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -72,3 +73,4 @@ namespace OpenSim.Framework.Data
         }      
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/OpenSimTableMapper.cs b/OpenSim/Framework/Data/OpenSimTableMapper.cs
index 744f0626da..f596b45eca 100644
--- a/OpenSim/Framework/Data/OpenSimTableMapper.cs
+++ b/OpenSim/Framework/Data/OpenSimTableMapper.cs
@@ -1,4 +1,5 @@
 using System.Data;
+/*
 using TribalMedia.Framework.Data;
 
 namespace OpenSim.Framework.Data
@@ -10,3 +11,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/
diff --git a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
index c915538453..227a98e239 100644
--- a/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
+++ b/OpenSim/Framework/Data/PrimitiveBaseShapeTableMapper.cs
@@ -1,8 +1,9 @@
 using System;
 using OpenSim.Framework;
-using TribalMedia.Framework.Data;
+//using TribalMedia.Framework.Data;
 using libsecondlife;
 
+/*
 namespace OpenSim.Framework.Data
 {
     public class PrimitiveBaseShapeRowMapper : BaseRowMapper<PrimitiveBaseShape>
@@ -141,3 +142,4 @@ namespace OpenSim.Framework.Data
         }
     }
 }
+*/