some deletions. add MatrixViewer