But seriously remove that class