Fix sort direction class removal