diff --git a/taglib/asf/asffile.cpp b/taglib/asf/asffile.cpp
index b7057c65..5c23ceb3 100644
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -320,23 +320,18 @@ void ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/)
   while(dataPos < dataSize) {
     ByteVector guid = file->readBlock(16);
     long long size = file->readQWORD();
-    BaseObject *obj = 0;
+    BaseObject *obj;
     if(guid == metadataGuid) {
       obj = new MetadataObject();
     }
     else if(guid == metadataLibraryGuid) {
       obj = new MetadataLibraryObject();
     }
-//FIXME this UnknownObject can be as large as whole file, so i disable it for now --Nick Shaforostoff <shafff@ukr.net>
-/*
     else {
       obj = new UnknownObject(guid);
     }
-*/
-    if(obj) {
-      obj->parse(file, size);
-      objects.append(obj);
-    }
+    obj->parse(file, size);
+    objects.append(obj);
     dataPos += size;
   }
 }
@@ -365,7 +360,6 @@ ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle proper
 ASF::File::~File()
 {
   for(unsigned int i = 0; i < d->objects.size(); i++) {
-    d->objects[i]->data.clear();
     delete d->objects[i];
   }
   if(d->tag) {