diff --git a/modules/Bio/EnsEMBL/DBSQL/AnalysisAdaptor.pm b/modules/Bio/EnsEMBL/DBSQL/AnalysisAdaptor.pm
index d0262786e5d814f83ea3802a035b0472ea978b65..1d0b5337f1b943d0e5aaf9a21c92b8ec942b38ab 100755
--- a/modules/Bio/EnsEMBL/DBSQL/AnalysisAdaptor.pm
+++ b/modules/Bio/EnsEMBL/DBSQL/AnalysisAdaptor.pm
@@ -193,14 +193,12 @@ SELECT DISTINCT analysis_id FROM %s |;
 sub feature_classes{
   # Can't think of a way to do this programatically, so hard-coded
   return qw(
-            AffyFeature
             DensityFeature
             DnaAlignFeature
             Gene
             PredictionTranscript
             MarkerFeature
-            OligoFeature
-            ProteinAlignFeature
+			ProteinAlignFeature
             ProteinFeature
             QtlFeature
             RepeatFeature
diff --git a/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm b/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
index b525a2872aef2e5bca8bfff16e2a942172cbc073..2d93e8723df66f92541485e40c81664552b3c4eb 100755
--- a/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
+++ b/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
@@ -298,14 +298,12 @@ sub get_available_adaptors {
     # Firstly those that just have an adaptor named after there object
     # in the main DBSQL directory.
     map( { $_ => "Bio::EnsEMBL::DBSQL::${_}Adaptor" } qw(
-        AffyFeature              AffyArray            AffyProbe
-        Analysis                 ArchiveStableId      Attribute
+									 Analysis                 ArchiveStableId      Attribute
         AssemblyExceptionFeature AssemblyMapper       CoordSystem
         CompressedSequence       DBEntry              DnaAlignFeature
         DensityFeature           DensityType          Exon
         Gene                     KaryotypeBand        MiscSet
-        MiscFeature              OligoArray           OligoFeature
-        OligoProbe               PredictionTranscript PredictionExon
+        MiscFeature              PredictionTranscript PredictionExon
         ProteinFeature           ProteinAlignFeature  RepeatConsensus
         RepeatFeature            Sequence             SimpleFeature
         Slice                    SupportingFeature    Transcript