Removing some dead code, and doing some cleanup in, ComplexMatrix