avoid a bunch of matrix creation
remove dead code that was still called.