removed uses of case