Code Review pull request

It's best not to have commented out code in master.