Removing matrix stuff, no point in it other than for it's own sake