cleaning up some code, and disable XEMBED event for the moment