Remove problematic class removal