Cleanup

Removed useless matrix stuff.