remove class check for now