Remove interim compatibility measures