Removed deprecated class