mat-scalar-up now return the matrix
clean up definition of subset-matrix-cols