Removed some old code in Matrix