Removed legacy out-commented lines.