Let's remove commented code from the PR.