Removed deprecated classes
4 files changed