Removed matrix class