Removed class Matrix