diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py
index 7eb0a2df..22606eb5 100644
--- a/cassandra/cqltypes.py
+++ b/cassandra/cqltypes.py
@@ -107,7 +107,7 @@ class CassandraTypeType(type):
         cls = type.__new__(metacls, name, bases, dct)
         if not name.startswith('_'):
             _casstypes[name] = cls
-            if not cls.typename.startswith("'org"):
+            if not cls.typename.startswith(apache_cassandra_type_prefix):
                 _cqltypes[cls.typename] = cls
         return cls
 
@@ -853,7 +853,7 @@ class TupleType(_ParameterizedType):
 
 
 class UserType(TupleType):
-    typename = "'org.apache.cassandra.db.marshal.UserType'"
+    typename = "org.apache.cassandra.db.marshal.UserType"
 
     _cache = {}
     _module = sys.modules[__name__]
@@ -956,7 +956,7 @@ class UserType(TupleType):
 
 
 class CompositeType(_ParameterizedType):
-    typename = "'org.apache.cassandra.db.marshal.CompositeType'"
+    typename = "org.apache.cassandra.db.marshal.CompositeType"
     num_subtypes = 'UNKNOWN'
 
     @classmethod
@@ -986,7 +986,7 @@ class CompositeType(_ParameterizedType):
 
 
 class DynamicCompositeType(CompositeType):
-    typename = "'org.apache.cassandra.db.marshal.DynamicCompositeType'"
+    typename = "org.apache.cassandra.db.marshal.DynamicCompositeType"
 
 
 class ColumnToCollectionType(_ParameterizedType):
@@ -995,12 +995,12 @@ class ColumnToCollectionType(_ParameterizedType):
     Cassandra includes this. We don't actually need or want the extra
     information.
     """
-    typename = "'org.apache.cassandra.db.marshal.ColumnToCollectionType'"
+    typename = "org.apache.cassandra.db.marshal.ColumnToCollectionType"
     num_subtypes = 'UNKNOWN'
 
 
 class ReversedType(_ParameterizedType):
-    typename = "'org.apache.cassandra.db.marshal.ReversedType'"
+    typename = "org.apache.cassandra.db.marshal.ReversedType"
     num_subtypes = 1
 
     @classmethod
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
index 1cd801ee..05f02c70 100644
--- a/cassandra/metadata.py
+++ b/cassandra/metadata.py
@@ -1058,7 +1058,6 @@ class TableMetadata(object):
         """
         comparator = getattr(self, 'comparator', None)
         if comparator:
-            # no such thing as DCT in CQL
             incompatible = issubclass(self.comparator, types.DynamicCompositeType)
 
             # no compact storage with more than one column beyond PK if there
diff --git a/cassandra/type_codes.py b/cassandra/type_codes.py
index 2f0ce8f5..daf882e4 100644
--- a/cassandra/type_codes.py
+++ b/cassandra/type_codes.py
@@ -59,4 +59,3 @@ MapType = 0x0021
 SetType = 0x0022
 UserType = 0x0030
 TupleType = 0x0031
-