cleanup extra classes