I certainly agree with @smulube - we should not have bits of commented code, as we can alway look in the git history if we need to refer to anything.