Remove old style class