removed extra class definitions