Remove GetSubMatrix: do it later
Link cleaver statically for now
Fix bad merge