WIP removing matrix