Removed extra classes