removed deprecated classes, added toString methods to model classes