removed deprecated classes and methods