VideoCommon: cleanup XF API