Conditional compile for XWT needs cleaning