Alright, class removal works for real now