-remove all nonsense matrix stuff that probably won't work at this stage
-code clean up.