removed unnecessary use of deprecated matrix struct