updates for xwin removal