Remove HAVE_MATRIXVIEW references