cleanups in sipb-xen-dev