redundant w_class removed