Removed deprecated classes and methods