removed also some old unused classes.