Removal of Matrix class