MatMult cleanup