diff -r a493a607b5bf -r eabc8c503852 khronosfws/openmax_al/src/engine/xaengine.c
--- a/khronosfws/openmax_al/src/engine/xaengine.c	Fri Sep 03 19:34:12 2010 -0500
+++ b/khronosfws/openmax_al/src/engine/xaengine.c	Tue Sep 21 11:38:43 2010 -0500
@@ -17,8 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
-
 #include "xaengine.h"
 #include "xaobjectitf.h"
 #include "xaengineitf.h"
@@ -26,7 +24,6 @@
 #include "xadynintmgmtitf.h"
 #include "xaaudioiodevicecapabilitiesitf.h"
 #include "xaaudioencodercapabilitiesitf.h"
-#include "xaconfigextensionsitf.h"
 #include "xathreadsafety.h"
 #include "xaframeworkmgr.h"  
 
@@ -37,18 +34,8 @@
     &XA_IID_ENGINE,
     &XA_IID_DYNAMICINTERFACEMANAGEMENT,
     &XA_IID_THREADSYNC,
-    /*    &XA_IID_CONFIGEXTENSION,*/
-    /*    &XA_IID_DEVICEVOLUME,*/
     &XA_IID_AUDIOIODEVICECAPABILITIES,
-    /*    &XA_IID_AUDIODECODERCAPABILITIES,*/
     &XA_IID_AUDIOENCODERCAPABILITIES
-    /*
-    &XA_IID_CAMERACAPABILITIES,
-    &XA_IID_IMAGEDECODERCAPABILITIES,
-    &XA_IID_IMAGEENCODERCAPABILITIES,
-    &XA_IID_VIDEODECODERCAPABILITIES,
-    &XA_IID_VIDEOENCODERCAPABILITIES
-     */
     };
 
 /*****************************************************************************
@@ -331,7 +318,6 @@
     XAEngineImpl* pImpl = (XAEngineImpl*) (*self);
     XAuint8 itfIdx = 0;
     DEBUG_API("->XAEngineImpl_FreeResources");
-    assert( pObj && pImpl && pObj == pObj->self );
 
     /* free all allocated interfaces */
     for (itfIdx = 0; itfIdx < ENGINE_ITFCOUNT; itfIdx++)