change some out-commented code to have the right intent in case we need it later