Removed deprecated classes