Please remove commented code in a separate pull request.