Remove class requirement