Commented out stuff shouldn't be part of the pull request