Get rid of WxWidget refs