cleaning up the mess

we should have better matrix traits but will do later