Removed dead code; CMatrix class improvements