removed safe matrices and vectors