Got rid of some useless stuff.
Ported Matrix to vector-space.