New branch for the xetc etc removal stuff