CB-5816 remove out-commented code