removed deprecated classes