cleanup extra class definition