[clean] sanitize commented stuff out. Contributes to JB#10132