remove unnecessary commented lines.
Merge branch 'FixUpShapes' into FixUp_IntegralInvariant