removed matrix implementation (will be added in another branch)