Removed XE stuff