Removed more XAJAX calls