remove Matrix class