removing class check