Second round of removing couts
Second round of removing couts