removed extra classes